From: Russell King <rmk@arm•linux.org.uk>
To: Dan Williams <dan.j.williams@intel•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
Sascha Hauer <s.hauer@pengutronix•de>,
Guennadi Liakhovetski <lg@denx•de>
Subject: Re: linux-next: manual merge of the async_tx tree with the arm tree
Date: Mon, 16 Mar 2009 22:28:22 +0000 [thread overview]
Message-ID: <20090316222822.GA12334@flint.arm.linux.org.uk> (raw)
In-Reply-To: <1237241887.27945.13.camel@dwillia2-linux.ch.intel.com>
On Mon, Mar 16, 2009 at 03:18:07PM -0700, Dan Williams wrote:
> On Sun, 2009-03-15 at 21:10 -0700, Stephen Rothwell wrote:
> > Hi Dan, Russell,
> >
> > Today's linux-next merge of the async_tx tree got a conflict in
> > drivers/video/mx3fb.c between commit
> > 9eb2eb8c40ffd30da322648c4415bae0288eb167 ("MX31 clkdev support") from the
> > arm tree and commits 1febd91acff907152e61eb5ad0a82dd8d7db21c6 ("Revert
> > "i.MX31: framebuffer driver"") and
> > 6e1588cbd88590273300403648aef70e6bdaf5af ("i.MX31: framebuffer driver")
> > from the async_tx tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary).
> > --
> > Cheers,
> > Stephen Rothwell sfr@canb•auug.org.au
> > http://www.canb.auug.org.au/~sfr/
>
> Thanks Stephen!
>
> Russell, if you are merging other changes for this driver it makes sense
> for the tabs-to-space fix to go in through your tree as well. If you
> agree please pull from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git imx-fb-fix
Pulled.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
next prev parent reply other threads:[~2009-03-16 22:28 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-16 4:10 linux-next: manual merge of the async_tx tree with the arm tree Stephen Rothwell
2009-03-16 22:18 ` Dan Williams
2009-03-16 22:28 ` Russell King [this message]
2009-03-16 23:12 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2010-07-27 2:08 Stephen Rothwell
2010-07-28 3:58 ` Rabin VINCENT
2010-07-28 4:43 ` Stephen Rothwell
2010-07-28 7:11 ` Dan Williams
2010-07-28 7:43 ` Russell King
2010-07-28 23:50 ` Linus Walleij
2010-08-03 8:09 ` Dan Williams
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=20090316222822.GA12334@flint.arm.linux.org.uk \
--to=rmk@arm$(echo .)linux.org.uk \
--cc=dan.j.williams@intel$(echo .)com \
--cc=lg@denx$(echo .)de \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=s.hauer@pengutronix$(echo .)de \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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