From: "Luis R. Rodriguez" <mcgrof@suse.com>
To: cocci@systeme.lip6.fr
Subject: Re: [PATCH v4] staging: sm750fb: use arch_phys_wc_add() and ioremap_wc()
Date: Thu, 14 May 2015 14:06:48 +0000 [thread overview]
Message-ID: <20150514140648.GT23057@wotan.suse.de> (raw)
In-Reply-To: <20150510130903.GA30824@kroah.com>
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
prev parent reply other threads:[~2015-05-14 14:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-05 0:15 [PATCH v4] staging: sm750fb: use arch_phys_wc_add() and ioremap_wc() Luis R. Rodriguez
2015-05-10 13:09 ` Greg KH
2015-05-14 14:06 ` Luis R. Rodriguez [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150514140648.GT23057@wotan.suse.de \
--to=mcgrof@suse.com \
--cc=cocci@systeme.lip6.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).