linux-kernel - linux-next: manual merge of the sound tree with the mips 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]

Date:	Mon, 19 Sep 2011 15:29:21 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Takashi Iwai <tiwai@...e.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Manuel Lauss <manuel.lauss@...glemail.com>,
	Ralf Baechle <ralf@...ux-mips.org>,
	Mark Brown <broonie@...nsource.wolfsonmicro.com>
Subject: linux-next: manual merge of the sound tree with the mips tree

Hi Takashi,

Today's linux-next merge of the sound tree got a conflict in
sound/mips/Kconfig between commit 9d7dec27ace1 ("MIPS: Alchemy: remove
all CONFIG_SOC_AU1??? defines") from the mips tree and commit
7137c6bcb7ff ("ALSA: deprecate MIPS AU1X00 AC97 driver") from the sound
tree.

Just context changes.  I fixed it up (see below) anc can carry the fix
as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc sound/mips/Kconfig
index 0a0d501,77dd0a1..0000000
--- a/sound/mips/Kconfig
+++ b/sound/mips/Kconfig
@@@ -23,8 -23,8 +23,8 @@@ config SND_SGI_HAL
  
  
  config SND_AU1X00
- 	tristate "Au1x00 AC97 Port Driver"
+ 	tristate "Au1x00 AC97 Port Driver (DEPRECATED)"
 -	depends on SOC_AU1000 || SOC_AU1100 || SOC_AU1500
 +	depends on MIPS_ALCHEMY
  	select SND_PCM
  	select SND_AC97_CODEC
  	help
--
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/