linux-kernel - Re: linux-next: manual merge of the sound-asoc tree with Linus' 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: <20101015100452.GB14782@rakim.wolfsonmicro.main>
Date:	Fri, 15 Oct 2010 11:04:52 +0100
From:	Mark Brown <broonie@...nsource.wolfsonmicro.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Liam Girdwood <lrg@...mlogic.co.uk>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Timur Tabi <timur@...escale.com>,
	Kumar Gala <galak@...nel.crashing.org>
Subject: Re: linux-next: manual merge of the sound-asoc tree with Linus'
 tree

On Fri, Oct 15, 2010 at 11:52:51AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the sound-asoc tree got a conflict in
> arch/powerpc/platforms/85xx/p1022_ds.c between commit
> dc1c41f450a5f201f1d8c19aef32319f3b84c273 ("powerpc/85xx: Fix compile
> issue with p1022_ds due to lmb rename to memblock") from Linus' tree and
> commit 2c184cd393d1410bb43ac656a6480849fe886b1d ("powerpc/85xx: add DIU
> support to the Freecale P1022DS reference board") from the sound-asoc
> tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

I had to apply the reverse of that to to apply on ASoC so this looks to
be the best fix :)
--
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/