Merge branch 'next' into for-linus

Prepare input updates for 4.18 merge window.

diff --combined drivers/input/mouse/synaptics.c
index a9591d2,e3e0ef5..55d3350
--- 1/drivers/input/mouse/synaptics.c
--- 2/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@@ -172,12 -172,6 +172,12 @@@ static const char * const smbus_pnp_ids
        "LEN0048", /* X1 Carbon 3 */
        "LEN0046", /* X250 */
        "LEN004a", /* W541 */
 +      "LEN0071", /* T480 */
 +      "LEN0072", /* X1 Carbon Gen 5 (2017) - Elan/ALPS trackpoint */
 +      "LEN0073", /* X1 Carbon G5 (Elantech) */
 +      "LEN0092", /* X1 Carbon 6 */
 +      "LEN0096", /* X280 */
 +      "LEN0097", /* X280 -> ALPS trackpoint */
        "LEN200f", /* T450s */
        NULL
  };
@@@ -1754,7 -1748,7 +1754,7 @@@ static int synaptics_create_intertouch(
        };
  
        return psmouse_smbus_init(psmouse, &intertouch_board,
-                                 &pdata, sizeof(pdata),
+                                 &pdata, sizeof(pdata), true,
                                  leave_breadcrumbs);
  }