From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jiri Kosina <jikos@jikos.cz>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Barksdale <dbarksdale@uplogix.com>,
Dinesh Ram <Dinesh.Ram@cern.ch>,
Mauro Carvalho Chehab <m.chehab@samsung.com>,
Benjamin Tissoires <benjamin.tissoires@redhat.com>
Subject: linux-next: manual merge of the hid tree with Linus' tree
Date: Thu, 20 Feb 2014 13:03:29 +1100 [thread overview]
Message-ID: <20140220130329.cbf82034cb246805a4fd59ca@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1038 bytes --]
Hi Jiri,
Today's linux-next merge of the hid tree got a conflict in
drivers/hid/hid-ids.h between commits adc232592337 ("[media] si4713: HID
blacklist Si4713 USB development board") and 3db187e7bf76 ("HID:
multitouch: add FocalTech FTxxxx support") from Linus' tree and commit
e932d8178667 ("HID: add hid-cp2112 driver") from the hid tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/hid/hid-ids.h
index 22f28d6b33a8,00be0d0f0dde..000000000000
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -241,9 -240,7 +241,10 @@@
#define USB_VENDOR_ID_CYGNAL 0x10c4
#define USB_DEVICE_ID_CYGNAL_RADIO_SI470X 0x818a
+#define USB_DEVICE_ID_FOCALTECH_FTXXXX_MULTITOUCH 0x81b9
+
+#define USB_DEVICE_ID_CYGNAL_RADIO_SI4713 0x8244
+ #define USB_DEVICE_ID_CYGNAL_CP2112 0xea90
#define USB_VENDOR_ID_CYPRESS 0x04b4
#define USB_DEVICE_ID_CYPRESS_MOUSE 0x0001
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-02-20 2:03 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-20 2:03 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-15 1:53 linux-next: manual merge of the hid tree with Linus' tree Stephen Rothwell
2022-04-21 23:33 Stephen Rothwell
2015-02-24 0:00 Stephen Rothwell
2014-10-31 0:58 Stephen Rothwell
2014-03-17 2:32 Stephen Rothwell
2014-02-20 2:04 Stephen Rothwell
2013-03-28 0:40 Stephen Rothwell
2012-09-10 1:33 Stephen Rothwell
2012-09-10 5:49 ` Marek Vasut
2012-06-27 1:05 Stephen Rothwell
2011-10-11 3:37 Stephen Rothwell
2011-10-11 10:52 ` Jiri Kosina
2010-11-09 1:33 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140220130329.cbf82034cb246805a4fd59ca@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Dinesh.Ram@cern.ch \
--cc=benjamin.tissoires@redhat.com \
--cc=dbarksdale@uplogix.com \
--cc=jikos@jikos.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=m.chehab@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).