Merge remote-tracking branch 'input/next'

diff --cc drivers/input/keyboard/Kconfig
Simple merge

diff --cc drivers/input/tablet/wacom_sys.c
Simple merge

diff --cc drivers/input/tablet/wacom_wac.c
index da0d8761e778cfd8f79e64b26a0ce3acd8cf60c5,6b9adc7bec6ea5afa1ab1860de41222edf0216c8..ecfcbc8144dca62757b105b5275e71f3b8371b64
--- 1/drivers/input/tablet/wacom_wac.c
--- 2/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@@ -799,10 -799,15 +799,13 @@@ static int wacom_bpt_touch(struct wacom
        unsigned char *data = wacom->data;
        int i;
  
+       if (data[0] != 0x02)
+           return 0;
+ 
        for (i = 0; i < 2; i++) {
 -              int p = data[9 * i + 2];
 -              bool touch = p && !wacom->shared->stylus_in_proximity;
 +              int offset = (data[1] & 0x80) ? (8 * i) : (9 * i);
 +              bool touch = data[offset + 3] & 0x80;
  
 -              input_mt_slot(input, i);
 -              input_mt_report_slot_state(input, MT_TOOL_FINGER, touch);
                /*
                 * Touch events need to be disabled while stylus is
                 * in proximity because user's hand is resting on touchpad