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

Message-ID: <s5hoc4ee88p.wl%tiwai@suse.de>
Date:	Sun, 10 Apr 2011 12:00:38 +0200
From:	Takashi Iwai <tiwai@...e.de>
To:	Mark Brown <broonie@...nsource.wolfsonmicro.com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Lucas De Marchi <lucas.demarchi@...fusion.mobi>
Subject: Re: linux-next: manual merge of the sound tree with Linus' tree

At Fri, 8 Apr 2011 07:16:30 +0100,
Mark Brown wrote:
> 
> On Fri, Apr 08, 2011 at 02:38:25PM +1000, Stephen Rothwell wrote:
> 
> > Today's linux-next merge of the sound tree got a conflict in
> > sound/soc/codecs/wm8994.c between commit 25985edcedea ("Fix common
> > misspellings") from Linus' tree and commit f701a2e594e6 ("ASoC: Factor
> > WM8958 DSP2 handling into separate file") from the sound tree.
> 
> > The latter moved the code changed by the former into another file.  I did
> > not bother fixing the spelling errors there.
> 
> I guess I'll fix this by merging up next time there's a -rc.  Not sure
> why such patches aren't getting done against -next, though.

It'd be helpful if you can resolve in your tree.
I've been sick and can't work much since days ago.


thanks,

Takashi
--
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/