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,
Reyad Attiyat <reyad.attiyat@gmail•com>,
Hans de Goede <hdegoede@redhat•com>
Subject: linux-next: manual merge of the hid tree with Linus' tree
Date: Thu, 20 Feb 2014 13:04:15 +1100 [thread overview]
Message-ID: <20140220130415.dec1afdd528ce945f0771afc@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1438 bytes --]
Hi Jiri,
Today's linux-next merge of the hid tree got a conflict in
drivers/hid/hid-core.c between commit 117309c51dca ("HID: microsoft: Add
ID's for Surface Type/Touch Cover 2") from Linus' tree and commit
3faed1aff786 ("HID: hid-microsoft: Add support for scrollwheel and
special keypad keys") 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-core.c
index cc32a6f96c64,6f579dfba6ee..000000000000
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@ -1780,8 -1823,7 +1824,9 @@@ static const struct hid_device_id hid_h
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) },
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) },
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) },
{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },
{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },
{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1) },
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-02-20 2:04 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-20 2:04 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:03 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=20140220130415.dec1afdd528ce945f0771afc@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hdegoede@redhat$(echo .)com \
--cc=jikos@jikos$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=reyad.attiyat@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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