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,
Hans de Goede <hdegoede@redhat.com>,
Olivier Gay <ogay@logitech.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>
Subject: linux-next: manual merge of the hid tree with Linus' tree
Date: Fri, 31 Oct 2014 11:58:43 +1100 [thread overview]
Message-ID: <20141031115843.155b65e0@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1286 bytes --]
Hi Jiri,
Today's linux-next merge of the hid tree got a conflict in drivers/hid/hid-input.c between commit f974008f07a6 ("HID: add keyboard input assist hid usages") from Linus' tree and commit afdb5cce979b ("HID: input: Map unknown consumer page codes to KEY_UNKNOWN") 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-input.c
index 725f22ca47fc,7ea582be9c9a..000000000000
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@@ -865,14 -862,7 +865,14 @@@ static void hidinput_configure_usage(st
case 0x28b: map_key_clear(KEY_FORWARDMAIL); break;
case 0x28c: map_key_clear(KEY_SEND); break;
+ case 0x2c7: map_key_clear(KEY_KBDINPUTASSIST_PREV); break;
+ case 0x2c8: map_key_clear(KEY_KBDINPUTASSIST_NEXT); break;
+ case 0x2c9: map_key_clear(KEY_KBDINPUTASSIST_PREVGROUP); break;
+ case 0x2ca: map_key_clear(KEY_KBDINPUTASSIST_NEXTGROUP); break;
+ case 0x2cb: map_key_clear(KEY_KBDINPUTASSIST_ACCEPT); break;
+ case 0x2cc: map_key_clear(KEY_KBDINPUTASSIST_CANCEL); break;
+
- default: goto ignore;
+ default: map_key_clear(KEY_UNKNOWN);
}
break;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-10-31 0:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-31 0:58 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-03-17 2:32 Stephen Rothwell
2014-02-20 2:04 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=20141031115843.155b65e0@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dmitry.torokhov@gmail.com \
--cc=hdegoede@redhat.com \
--cc=jikos@jikos.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ogay@logitech.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).