Merge branch 'next' into for-linus

Prepare input updates for 4.11 merge window.

diff --cc drivers/input/mouse/elan_i2c_core.c
Simple merge

diff --cc drivers/input/rmi4/Kconfig
index bb7762bf2879b3a7383b2d326a859833adbbf360,78a78b99ec31eadf8ac0959af05f522f22809ef5..7172b88cd0649c8de16ac7373ec2a16c42c338d2
--- 1/drivers/input/rmi4/Kconfig
--- 2/drivers/input/rmi4/Kconfig
+++ b/drivers/input/rmi4/Kconfig
@@@ -40,24 -42,16 +42,23 @@@ config RMI4_SM
          called rmi_smbus.
  
  config RMI4_F03
-         bool "RMI4 Function 03 (PS2 Guest)"
+       bool "RMI4 Function 03 (PS2 Guest)"
 -      depends on SERIO=y || RMI4_CORE=SERIO
 +      depends on RMI4_CORE
-         help
-           Say Y here if you want to add support for RMI4 function 03.
+       help
+         Say Y here if you want to add support for RMI4 function 03.
  
-           Function 03 provides PS2 guest support for RMI4 devices. This
-           includes support for TrackPoints on TouchPads.
+         Function 03 provides PS2 guest support for RMI4 devices. This
+         includes support for TrackPoints on TouchPads.
  
 +config RMI4_F03_SERIO
 +      tristate
 +      depends on RMI4_CORE
 +      depends on RMI4_F03
 +      default RMI4_CORE
 +      select SERIO
 +
  config RMI4_2D_SENSOR
        bool
-       depends on RMI4_CORE
  
  config RMI4_F11
        bool "RMI4 Function 11 (2D pointing)"

diff --cc drivers/input/rmi4/rmi_driver.c
Simple merge