From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Martin Fuzzey <mfuzzey@gmail.com>,
Sascha Hauer <s.hauer@pengutronix.de>
Subject: Re: linux-next: manual merge of the usb tree with the i.MX tree
Date: Fri, 26 Feb 2010 09:04:03 +0100 [thread overview]
Message-ID: <20100226080403.GA24846@pengutronix.de> (raw)
In-Reply-To: <20100226182545.b4d5b6c7.sfr@canb.auug.org.au>
Hi Stephen,
On Fri, Feb 26, 2010 at 06:25:45PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the usb tree got a conflict in
> arch/arm/mach-mx2/devices.c between various commits from the i.MX tree
> and commits 304ae32ac8ac68ac5a091a67187645dc84b6067c ("USB: MXC: use
> DMA_BIT_MASK macro rather than hardcoded constants") and
> 3f1c5d0f4c64f5e9e4ac329a935b3da67593691f ("USB: MXC: add platform
> resources for i.MX21 USB host controller") from the usb tree.
>
> I fixed it up (I think - see below) and cam carry the fixes as necessary.
looks OK for me, too.
thanks Stephen,
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
next prev parent reply other threads:[~2010-02-26 8:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-26 7:25 linux-next: manual merge of the usb tree with the i.MX tree Stephen Rothwell
2010-02-26 8:04 ` Uwe Kleine-König [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-03-04 4:58 Stephen Rothwell
2011-03-04 17:12 ` Greg KH
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=20100226080403.GA24846@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mfuzzey@gmail.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).