Merge tag 'v4.0-rc5' into next

Merge with the latest upstream to synchronize Synaptics changes
and bring in new infrastructure pieces.

Conflicts:
	drivers/input/mouse/synaptics.c

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 943ed01,fae26d0..c862cf9
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -63,9 -75,9 +75,10 @@@ fsl  Freescale Semiconducto
  GEFanuc       GE Fanuc Intelligent Platforms Embedded Systems, Inc.
  gef   GE Fanuc Intelligent Platforms Embedded Systems, Inc.
  geniatech     Geniatech, Inc.
+ giantplus     Giantplus Technology Co., Ltd.
  globalscale   Globalscale Technologies, Inc.
  gmt   Global Mixed-mode Technology, Inc.
 +goodix        Shenzhen Huiding Technology Co., Ltd.
  google        Google, Inc.
  gumstix       Gumstix, Inc.
  gw    Gateworks Corporation

diff --cc drivers/input/mouse/psmouse-base.c
Simple merge

diff --cc drivers/input/mouse/synaptics.c
index 4c69e33,dda6058..d73a942
--- 1/drivers/input/mouse/synaptics.c
--- 2/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@@ -612,6 -670,20 +677,18 @@@ static void synaptics_parse_agm(const u
        }
  }
  
 -static bool is_forcepad;
 -
+ static void synaptics_parse_ext_buttons(const unsigned char buf[],
+                                       struct synaptics_data *priv,
+                                       struct synaptics_hw_state *hw)
+ {
+       unsigned int ext_bits =
+               (SYN_CAP_MULTI_BUTTON_NO(priv->ext_cap) + 1) >> 1;
+       unsigned int ext_mask = GENMASK(ext_bits - 1, 0);
+ 
+       hw->ext_buttons = buf[4] & ext_mask;
+       hw->ext_buttons |= (buf[5] & ext_mask) << ext_bits;
+ }
+ 
  static int synaptics_parse_hw_state(const unsigned char buf[],
                                    struct synaptics_data *priv,
                                    struct synaptics_hw_state *hw)

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

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

diff --cc include/uapi/linux/input.h
Simple merge