Merge tag 'v4.11-rc5' into next

Sync up with mainline to bring in changes to input subsystem merged
through other trees.

diff --cc drivers/input/mouse/alps.c
index e761955,f210e19..262d105
--- 1/drivers/input/mouse/alps.c
--- 2/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@@ -2831,17 -2861,8 +2865,14 @@@ static int alps_identify(struct psmous
                           ec[2] >= 0x90 && ec[2] <= 0x9d) {
                        protocol = &alps_v3_protocol_data;
                } else if (e7[0] == 0x73 && e7[1] == 0x03 &&
-                          e7[2] == 0x14 && ec[1] == 0x02) {
-                       protocol = &alps_v8_protocol_data;
-               } else if (e7[0] == 0x73 && e7[1] == 0x03 &&
-                          e7[2] == 0x28 && ec[1] == 0x01) {
+                          (e7[2] == 0x14 || e7[2] == 0x28)) {
                        protocol = &alps_v8_protocol_data;
 +              } else if (e7[0] == 0x73 && e7[1] == 0x03 && e7[2] == 0xc8) {
 +                      protocol = &alps_v9_protocol_data;
 +                      psmouse_warn(psmouse,
 +                                   "Unsupported ALPS V9 touchpad: E7=%3ph, EC=%3ph\n",
 +                                   e7, ec);
 +                      return -EINVAL;
                } else {
                        psmouse_dbg(psmouse,
                                    "Likely not an ALPS touchpad: E7=%3ph, EC=%3ph\n", e7, ec);

diff --cc drivers/input/mouse/alps.h
Simple merge

diff --cc include/linux/mfd/cros_ec_commands.h
Simple merge