linux-kernel - Re: linux-next: manual merge of the sound tree with the arm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <4C460D0B.4040407@bluewatersys.com>
Date:	Wed, 21 Jul 2010 08:54:35 +1200
From:	Ryan Mallon <ryan@...ewatersys.com>
To:	Mark Brown <broonie@...nsource.wolfsonmicro.com>
CC:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Takashi Iwai <tiwai@...e.de>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Russell King <rmk+kernel@....linux.org.uk>
Subject: Re: linux-next: manual merge of the sound tree with the arm tree

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@...ewatersys.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/