linux-kernel - linux-next: manual merge of the v4l-dvb tree with the 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:	Fri, 18 Nov 2011 12:04:29 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mauro Carvalho Chehab <mchehab@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Randy Dunlap <rdunlap@...otime.net>,
	Sylwester Nawrocki <snjw23@...il.com>
Subject: linux-next: manual merge of the v4l-dvb tree with the  tree

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/staging/media/as102/as102_drv.h between commit d29387e8de8b
("media/staging: fix allyesconfig build error") from Linus' tree and
commit 82aae98df488 ("[media] staging: as102: Remove leftovers of the SPI
bus driver") from the v4l-dvb tree.

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

diff --cc drivers/staging/media/as102/as102_drv.h
index fd33f5a,0ecef9e..0000000
--- a/drivers/staging/media/as102/as102_drv.h
+++ b/drivers/staging/media/as102/as102_drv.h
@@@ -37,8 -27,9 +27,10 @@@
  #define DRIVER_FULL_NAME "Abilis Systems as10x usb driver"
  #define DRIVER_NAME "as10x_usb"
  
 -extern int debug;
 +extern int as102_debug;
 +#define debug	as102_debug
+ extern struct usb_driver as102_usb_driver;
+ extern int elna_enable;
  
  #define dprintk(debug, args...) \
  	do { if (debug) {	\

Content of type "application/pgp-signature" skipped