[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20150514140648.GT23057@wotan.suse.de>
Date: Thu, 14 May 2015 16:06:48 +0200
From: "Luis R. Rodriguez" <mcgrof@...e.com>
To: Greg KH <gregkh@...uxfoundation.org>
Cc: "Luis R. Rodriguez" <mcgrof@...not-panic.com>,
sudipm.mukherjee@...il.com, teddy.wang@...iconmotion.com,
devel@...verdev.osuosl.org, Juergen Gross <jgross@...e.com>,
linux-fbdev@...r.kernel.org, Antonino Daplas <adaplas@...il.com>,
Daniel Vetter <daniel.vetter@...ll.ch>,
linux-kernel@...r.kernel.org, luto@...capital.net,
Tomi Valkeinen <tomi.valkeinen@...com>,
Thomas Gleixner <tglx@...utronix.de>,
Suresh Siddha <sbsiddha@...il.com>,
Dave Airlie <airlied@...hat.com>, Ingo Molnar <mingo@...e.hu>,
Jean-Christophe Plagniol-Villard <plagnioj@...osoft.com>,
cocci@...teme.lip6.fr
Subject: Re: [PATCH v4] staging: sm750fb: use arch_phys_wc_add() and
ioremap_wc()
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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists