linux-kernel - linux-next: manual merge of the bkl-config tree with the v4l-dvb 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: <20101228162615.f94b1478.sfr@canb.auug.org.au>
Date:	Tue, 28 Dec 2010 16:26:15 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Arnd Bergmann <arnd@...db.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Hans Verkuil <hverkuil@...all.nl>,
	Mauro Carvalho Chehab <mchehab@...hat.com>
Subject: linux-next: manual merge of the bkl-config tree with the v4l-dvb
 tree

Hi Arnd,

Today's linux-next merge of the bkl-config tree got a conflict in
drivers/staging/stradis/Kconfig between commit
aef01debdfad83ab71a83b7af8cd90203404c1aa ("[media] cpia, stradis: remove
deprecated V4L1 drivers") from the v4l-dvb tree and commit
f2fed18d2a61afa5592b3002407e432c689c33f4 ("staging/stradis: mark as
"depends on BKL"") from the bkl-config tree.

The former removed the file that the latter modified, so I removed the
file as well.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped