Messages in this thread | | | Date | Wed, 8 Feb 2012 10:52:28 +1100 | From | Stephen Rothwell <> | 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@opensource.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@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |