linux-kernel - linux-next: manual merge of the trivial tree with 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>] [day] [month] [year] [list]

Message-Id: <20120419135843.80ae7f770cb0b2bc426a2c62@canb.auug.org.au>
Date:	Thu, 19 Apr 2012 13:58:43 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Shawn Guo <shawn.guo@...aro.org>,
	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Liam Girdwood <lrg@...com>,
	Masanari Iida <standby24x7@...il.com>
Subject: linux-next: manual merge of the trivial tree with the sound-asoc
 tree

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
sound/soc/imx/Kconfig between commit a23dc694828e ("ASoC: imx: merge
sound/soc/imx into sound/soc/fsl") from the sound-asoc tree and commit
59bf89640647 ("Fix "the the" in various Kconfig") from the trivial tree.

The former merged the file into sound/soc/fsl/Kconfig (where the "the
the" now needs fixing).  I have just removed sound/soc/imx/Kconfig.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped