Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933481AbbENOG5 (ORCPT ); Thu, 14 May 2015 10:06:57 -0400 Received: from cantor2.suse.de ([195.135.220.15]:59944 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161074AbbENOGw (ORCPT ); Thu, 14 May 2015 10:06:52 -0400 Date: Thu, 14 May 2015 16:06:48 +0200 From: "Luis R. Rodriguez" To: Greg KH Cc: "Luis R. Rodriguez" , sudipm.mukherjee@gmail.com, teddy.wang@siliconmotion.com, devel@driverdev.osuosl.org, Juergen Gross , linux-fbdev@vger.kernel.org, Antonino Daplas , Daniel Vetter , linux-kernel@vger.kernel.org, luto@amacapital.net, Tomi Valkeinen , Thomas Gleixner , Suresh Siddha , Dave Airlie , Ingo Molnar , Jean-Christophe Plagniol-Villard , cocci@systeme.lip6.fr Subject: Re: [PATCH v4] staging: sm750fb: use arch_phys_wc_add() and ioremap_wc() Message-ID: <20150514140648.GT23057@wotan.suse.de> References: <1430784951-16505-1-git-send-email-mcgrof@do-not-panic.com> <20150510130903.GA30824@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150510130903.GA30824@kroah.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 916 Lines: 23 On Sun, May 10, 2015 at 03:09:03PM +0200, Greg KH wrote: > On Mon, May 04, 2015 at 05:15:51PM -0700, Luis R. Rodriguez wrote: > > --- > > drivers/staging/sm750fb/sm750.c | 36 ++++-------------------------------- > > drivers/staging/sm750fb/sm750.h | 3 --- > > drivers/staging/sm750fb/sm750_hw.c | 3 +-- > > 3 files changed, 5 insertions(+), 37 deletions(-) > > Still doesn't apply to my tree: I did base it on that day's staging tree, staging is just a fast moving tree. In the future use of SmPL, when provided, to address merge conflicts might help us on git. Meanwhile I've addressed the conflict and will send v5 based on today's tree outlook. Luis -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/