From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sachin Kamat <sachin.kamat@samsung.com>
Subject: Re: linux-next: manual merge of the akpm tree with the staging tree
Date: Thu, 10 Jul 2014 09:12:05 -0700 [thread overview]
Message-ID: <20140710161205.GB20239@kroah.com> (raw)
In-Reply-To: <20140710162750.60496f52@canb.auug.org.au>
On Thu, Jul 10, 2014 at 04:27:50PM +1000, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> drivers/staging/emxx_udc/emxx_udc.c between commit 6de2a1a7b9e2
> ("staging: emxx_udc: Fix build error") from the staging tree and commit
> "drivers/staging/emxx_udc/emxx_udc.c: replace strict_strto() with
> kstrto()" from the akpm tree.
>
> I fixed it up (I just used the version from the staging tree) and can
> carry the fix as necessary (no action is required).
Sounds good, thanks.
greg k-h
next prev parent reply other threads:[~2014-07-10 16:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-10 6:27 linux-next: manual merge of the akpm tree with the staging tree Stephen Rothwell
2014-07-10 16:12 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-08-13 7:53 Stephen Rothwell
2013-04-15 5:21 Stephen Rothwell
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=20140710161205.GB20239@kroah.com \
--to=greg@kroah.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sachin.kamat@samsung.com \
--cc=sfr@canb.auug.org.au \
/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).