From: Ryan Mallon <ryan@bluewatersys.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Takashi Iwai <tiwai@suse.de>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Russell King <rmk+kernel@arm.linux.org.uk>
Subject: Re: linux-next: manual merge of the sound tree with the arm tree
Date: Wed, 21 Jul 2010 08:54:35 +1200 [thread overview]
Message-ID: <4C460D0B.4040407@bluewatersys.com> (raw)
In-Reply-To: <20100720090355.GL10222@rakim.wolfsonmicro.main>
On 07/20/2010 09:03 PM, Mark Brown wrote:
> On Mon, Jul 19, 2010 at 11:00:54AM +1000, Stephen Rothwell wrote:
>
>> Today's linux-next merge of the sound tree got a conflict in
>> arch/arm/mach-ep93xx/clock.c between commit
>> 5c6649e3c1511b183f12d2e884d2c172fe9001e0 ("ARM: AMBA: Add pclk definition
>> for platforms using primecells") from the arm tree and commit
>> ed67ea82c0d9a163458dc6a69a7a3123db1a8b3b ("EP93xx: Add i2s core support")
>> from the sound tree.
>
>> Just overlapping additions. I fixed it up (see below) and can carry the
>> fix as necessary.
>
> Ryan, can you investigate where (if anywhere is good) the best place to
> carry the merge fixup is please?
The fix is fine. I don't really know much about how merge conflicts are
handled across trees, but I would think that it is probably easiest if
Stephen carries it.
~Ryan
--
Bluewater Systems Ltd - ARM Technology Solution Centre
Ryan Mallon 5 Amuri Park, 404 Barbadoes St
ryan@bluewatersys.com PO Box 13 889, Christchurch 8013
http://www.bluewatersys.com New Zealand
Phone: +64 3 3779127 Freecall: Australia 1800 148 751
Fax: +64 3 3779135 USA 1800 261 2934
next prev parent reply other threads:[~2010-07-20 20:54 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-19 1:00 linux-next: manual merge of the sound tree with the arm tree Stephen Rothwell
2010-07-20 9:03 ` Mark Brown
2010-07-20 20:54 ` Ryan Mallon [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-07-22 1:28 Stephen Rothwell
2010-07-22 6:18 ` Takashi Iwai
2009-03-10 3:45 Stephen Rothwell
2009-03-10 20:04 ` Mark Brown
2009-03-11 0:41 ` Stephen Rothwell
2009-03-11 6:58 ` Takashi Iwai
2009-03-11 8:52 ` Russell King
2009-03-11 9:18 ` Takashi Iwai
2009-03-11 9:41 ` Russell King
2009-03-11 10:02 ` Takashi Iwai
2009-03-11 10:40 ` Russell King
2009-03-11 11:24 ` Mark Brown
2009-03-11 13:28 ` Takashi Iwai
2009-03-11 22:32 ` Mark Brown
2009-03-12 2:48 ` Stephen Rothwell
2009-03-11 9:49 ` Mark Brown
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=4C460D0B.4040407@bluewatersys.com \
--to=ryan@bluewatersys.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=sfr@canb.auug.org.au \
--cc=tiwai@suse.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).