linux-kernel - linux-next: manual merge of the v4l-dvb tree with Linus' 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: <20120619112939.23c80aed8f1db9682e37be87@canb.auug.org.au>
Date:	Tue, 19 Jun 2012 11:29:39 +1000
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,
	Hans de Goede <hdegoede@...hat.com>,
	Jiri Kosina <jkosina@...e.cz>
Subject: linux-next: manual merge of the v4l-dvb tree with Linus' tree

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/hid/hid-ids.h between commit 9ed326951806 ("HID: multitouch: Add
support for Baanto touchscreen") from Linus' tree and commit 110301833d6f
("[media] radio/si470x: Add support for the Axentia ALERT FM USB
Receiver") 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/hid/hid-ids.h
index 6d3037e,70298d1..0000000
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -160,9 -157,9 +160,12 @@@
  #define USB_VENDOR_ID_AVERMEDIA		0x07ca
  #define USB_DEVICE_ID_AVER_FM_MR800	0xb800
  
+ #define USB_VENDOR_ID_AXENTIA		0x12cf
+ #define USB_DEVICE_ID_AXENTIA_FM_RADIO	0x7111
+ 
 +#define USB_VENDOR_ID_BAANTO		0x2453
 +#define USB_DEVICE_ID_BAANTO_MT_190W2	0x0100
 +
  #define USB_VENDOR_ID_BELKIN		0x050d
  #define USB_DEVICE_ID_FLIP_KVM		0x3201
  

Content of type "application/pgp-signature" skipped