linux-kernel - Re: linux-next: manual merge of the sound-asoc 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] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120208105228.a3b2ceeaba1a63e5df9dfbbc@canb.auug.org.au>
Date:	Wed, 8 Feb 2012 10:52:28 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mark Brown <broonie@...nsource.wolfsonmicro.com>
Cc:	Liam Girdwood <lrg@...mlogic.co.uk>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the sound-asoc tree

Hi Mark,

On Fri, 3 Feb 2012 10:51:24 +0000 Mark Brown <broonie@...nsource.wolfsonmicro.com> wrote:
>
> On Fri, Feb 03, 2012 at 12:59:02PM +1100, Stephen Rothwell wrote:
> 
> > I fixed it up (I think - see below) and can carry the fix as necessary.
> 
> That's the correct fix, thanks.  I'll resolve this in my tree once
> Linus' tree has merged the conflicting stuff.

So, you have redone the merge (it was commit 05960268bcef and is now
6127dd802637) and still left the conflict tags in
sound/soc/codecs/wm5100.c ...

:-(
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped