From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"\"Uwe Kleine-König\"" <u.kleine-koenig@pengutronix.de>,
"Arnd Bergmann" <arnd@arndb.de>
Subject: Re: linux-next: manual merge of the driver-core tree with the arm-soc tree
Date: Mon, 29 Aug 2011 12:33:44 -0700 [thread overview]
Message-ID: <20110829193344.GA13418@kroah.com> (raw)
In-Reply-To: <20110829143150.78ade5470cf62a83ad9b56f1@canb.auug.org.au>
On Mon, Aug 29, 2011 at 02:31:50PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/arm/plat-mxc/devices.c between commit 160a84cfc975 ("ARM: mxc: drop
> now unused function mxc_register_device") from the arm-soc tree and
> commit 0e392412f334 ("ARM: mxc: convert device creation to use
> platform_device_register_full") from the driver-core tree.
>
> Just context changes. I fixed it up (see below) anc can carry the fix as
> necessary.
Thanks, that looks fine.
greg k-h
next prev parent reply other threads:[~2011-08-29 19:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-29 4:31 linux-next: manual merge of the driver-core tree with the arm-soc tree Stephen Rothwell
2011-08-29 19:33 ` Greg KH [this message]
2014-11-21 5:41 Stephen Rothwell
2014-11-21 11:05 ` Arnd Bergmann
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=20110829193344.GA13418@kroah.com \
--to=greg@kroah.com \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=u.kleine-koenig@pengutronix.de \
/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).