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

Message-Id: <20110304163856.7ce5d15d.sfr@canb.auug.org.au>
Date:	Fri, 4 Mar 2011 16:38:56 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Hans Verkuil <hverkuil@...all.nl>,
	Mauro Carvalho Chehab <mchehab@...hat.com>,
	Timo von Holtz <tvh@...ormatik.uni-kiel.de>
Subject: linux-next: manual merge of the staging tree with the v4l-dvb tree

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/dabusb/dabusb.c and drivers/staging/dabusb/dabusb.h
between commit f8f4a7f5c1219571acf55f3889138b594e5b3b68 ("[media] dabusb:
remove obsolete driver") from the v4l-dvb tree and commit
868788278eaa5b841ec1a810b41e156f5fba0ab5 ("Staging: dabusb: fixed coding
style issues") from the staging tree.

I removed the files.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped