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,
Richard Zhao <richard.zhao@freescale.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
Fabio Estevam <fabio.estevam@freescale.com>
Subject: Re: linux-next: manual merge of the usb tree with the i.MX tree
Date: Fri, 4 Mar 2011 09:12:15 -0800 [thread overview]
Message-ID: <20110304171215.GA22173@kroah.com> (raw)
In-Reply-To: <20110304155800.b48993d7.sfr@canb.auug.org.au>
On Fri, Mar 04, 2011 at 03:58:00PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/gadget/fsl_mxc_udc.c between commit
> 4d2f13be1e370a670c1cae20c194d5ce961e0fa5 ("ARM: imx3x: clean up
> ARCH_MX3X") from the i.MX tree and commit
> a51ea8cc9cfcfd719240455ff8f217b4f165d1d0 ("usb: gadget/fsl_mxc_udc:
> Detect the CPU type in run-time") from the usb tree.
>
> The latter is a superset of the former, so I used that.
Thanks, I appreciate it.
greg k-h
next prev parent reply other threads:[~2011-03-04 17:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-04 4:58 linux-next: manual merge of the usb tree with the i.MX tree Stephen Rothwell
2011-03-04 17:12 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-02-26 7:25 Stephen Rothwell
2010-02-26 8:04 ` Uwe Kleine-König
2010-02-26 7:10 Stephen Rothwell
2010-02-26 8:04 ` Uwe Kleine-König
2010-02-26 8:09 ` 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=20110304171215.GA22173@kroah.com \
--to=greg@kroah.com \
--cc=fabio.estevam@freescale.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=richard.zhao@freescale.com \
--cc=s.hauer@pengutronix.de \
--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).