Merge branch 'for-5.13/surface-system-aggregator-intergration' into for-linus

- Surface Aggregator Module support from Maximilian Luz

diff --combined MAINTAINERS
index cbfe57e03e89a569ff0ef4ea28b1d221673a1b9f,d6a1924afdcc9f672830b74e77c661740b55f7dc..70d6cd1647679c0f171aee5469629d5552fe3dde
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -261,6 -261,8 +261,8 @@@ ABI/AP
  L:    [email protected]
  F:    include/linux/syscalls.h
  F:    kernel/sys_ni.c
+ F:    include/uapi/
+ F:    arch/*/include/uapi/
  
  ABIT UGURU 1,2 HARDWARE MONITOR DRIVER
  M:    Hans de Goede <[email protected]>
@@@ -436,6 -438,15 +438,15 @@@ S:       Orpha
  F:    drivers/platform/x86/wmi.c
  F:    include/uapi/linux/wmi.h
  
+ ACRN HYPERVISOR SERVICE MODULE
+ M:    Shuo Liu <[email protected]>
+ L:    [email protected] (subscribers-only)
+ S:    Supported
+ W:    https://projectacrn.org
+ F:    Documentation/virt/acrn/
+ F:    drivers/virt/acrn/
+ F:    include/uapi/linux/acrn.h
+ 
  AD1889 ALSA SOUND DRIVER
  L:    [email protected]
  S:    Maintained
@@@ -1017,7 -1028,7 +1028,7 @@@ F:      Documentation/devicetree/bindings/mu
  F:    drivers/mux/adgs1408.c
  
  ANALOG DEVICES INC ADIN DRIVER
- M:    Alexandru Ardelean <alexaundru.ardelean@analog.com>
+ M:    Michael Hennerich <michael.hennerich@analog.com>
  L:    [email protected]
  S:    Supported
  W:    http://ez.analog.com/community/linux-device-drivers
@@@ -1025,7 -1036,7 +1036,7 @@@ F:      Documentation/devicetree/bindings/ne
  F:    drivers/net/phy/adin.c
  
  ANALOG DEVICES INC ADIS DRIVER LIBRARY
- M:    Alexandru Ardelean <alexandru.ardelean@analog.com>
+ M:    Nuno Sa <nuno.sa@analog.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/iio/imu/adis.c
@@@ -2569,7 -2580,7 +2580,7 @@@ L:      [email protected]
  S:    Maintained
  F:    drivers/clk/keystone/
  
- ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE
+ ARM/TEXAS INSTRUMENT KEYSTONE CLOCKSOURCE
  M:    Santosh Shilimkar <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -2828,9 -2839,7 +2839,7 @@@ S:      Odd fixe
  W:    http://sourceforge.net/projects/xscaleiop
  F:    Documentation/crypto/async-tx-api.rst
  F:    crypto/async_tx/
- F:    drivers/dma/
  F:    include/linux/async_tx.h
- F:    include/linux/dmaengine.h
  
  AT24 EEPROM DRIVER
  M:    Bartosz Golaszewski <[email protected]>
@@@ -2975,7 -2984,7 +2984,7 @@@ F:      include/uapi/linux/audit.
  F:    kernel/audit*
  
  AUXILIARY DISPLAY DRIVERS
- M:    Miguel Ojeda Sandonis <[email protected]>
+ M:    Miguel Ojeda <[email protected]>
  S:    Maintained
  F:    drivers/auxdisplay/
  F:    include/linux/cfag12864b.h
@@@ -3733,6 -3742,13 +3742,13 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/tg3.*
  
+ BROADCOM VK DRIVER
+ M:    Scott Branden <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/misc/bcm-vk/
+ F:    include/uapi/linux/misc/bcm_vk.h
+ 
  BROCADE BFA FC SCSI DRIVER
  M:    Anil Gurumurthy <[email protected]>
  M:    Sudarsana Kalluru <[email protected]>
@@@ -3839,6 -3855,29 +3855,29 @@@ W:    https://github.com/Cascoda/ca8210-li
  F:    Documentation/devicetree/bindings/net/ieee802154/ca8210.txt
  F:    drivers/net/ieee802154/ca8210.c
  
+ CANAAN/KENDRYTE K210 SOC FPIOA DRIVER
+ M:    Damien Le Moal <[email protected]>
+ L:    [email protected]
+ L:    [email protected] (pinctrl driver)
+ F:    Documentation/devicetree/bindings/pinctrl/canaan,k210-fpioa.yaml
+ F:    drivers/pinctrl/pinctrl-k210.c
+ 
+ CANAAN/KENDRYTE K210 SOC RESET CONTROLLER DRIVER
+ M:    Damien Le Moal <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/reset/canaan,k210-rst.yaml
+ F:    drivers/reset/reset-k210.c
+ 
+ CANAAN/KENDRYTE K210 SOC SYSTEM CONTROLLER DRIVER
+ M:    Damien Le Moal <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:      Documentation/devicetree/bindings/mfd/canaan,k210-sysctl.yaml
+ F:    drivers/soc/canaan/
+ F:    include/soc/canaan/
+ 
  CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS
  M:    David Howells <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -4114,13 -4153,13 +4153,13 @@@ F:   scripts/extract-cert.
  F:    scripts/sign-file.c
  
  CFAG12864B LCD DRIVER
- M:    Miguel Ojeda Sandonis <[email protected]>
+ M:    Miguel Ojeda <[email protected]>
  S:    Maintained
  F:    drivers/auxdisplay/cfag12864b.c
  F:    include/linux/cfag12864b.h
  
  CFAG12864BFB LCD FRAMEBUFFER DRIVER
- M:    Miguel Ojeda Sandonis <[email protected]>
+ M:    Miguel Ojeda <[email protected]>
  S:    Maintained
  F:    drivers/auxdisplay/cfag12864bfb.c
  F:    include/linux/cfag12864b.h
@@@ -4290,7 -4329,7 +4329,7 @@@ S:      Supporte
  F:    drivers/infiniband/hw/usnic/
  
  CLANG-FORMAT FILE
- M:    Miguel Ojeda <[email protected]>
+ M:    Miguel Ojeda <[email protected]>
  S:    Maintained
  F:    .clang-format
  
@@@ -4305,8 -4344,6 +4344,6 @@@ C:      irc://chat.freenode.net/clangbuiltli
  F:    Documentation/kbuild/llvm.rst
  F:    include/linux/compiler-clang.h
  F:    scripts/clang-tools/
- F:    scripts/clang-version.sh
- F:    scripts/lld-version.sh
  K:    \b(?i:clang|llvm)\b
  
  CLEANCACHE API
@@@ -4432,10 -4469,21 +4469,21 @@@ S:   Maintaine
  F:    drivers/platform/x86/compal-laptop.c
  
  COMPILER ATTRIBUTES
- M:    Miguel Ojeda <[email protected]>
+ M:    Miguel Ojeda <[email protected]>
  S:    Maintained
  F:    include/linux/compiler_attributes.h
  
+ COMPUTE EXPRESS LINK (CXL)
+ M:    Alison Schofield <[email protected]>
+ M:    Vishal Verma <[email protected]>
+ M:    Ira Weiny <[email protected]>
+ M:    Ben Widawsky <[email protected]>
+ M:    Dan Williams <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/cxl/
+ F:    include/uapi/linux/cxl_mem.h
+ 
  CONEXANT ACCESSRUNNER USB DRIVER
  L:    [email protected]
  S:    Orphan
@@@ -5271,6 -5319,7 +5319,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/dma/
  F:    Documentation/driver-api/dmaengine/
  F:    drivers/dma/
+ F:    include/linux/dma/
  F:    include/linux/dmaengine.h
  F:    include/linux/of_dma.h
  
@@@ -6940,9 -6989,10 +6989,10 @@@ M:    Wu Hao <[email protected]
  R:    Tom Rix <[email protected]>
  L:    [email protected]
  S:    Maintained
- F:    Documentation/ABI/testing/sysfs-bus-dfl
+ F:    Documentation/ABI/testing/sysfs-bus-dfl*
  F:    Documentation/fpga/dfl.rst
  F:    drivers/fpga/dfl*
+ F:    include/linux/dfl.h
  F:    include/uapi/linux/fpga-dfl.h
  
  FPGA MANAGER FRAMEWORK
@@@ -7278,13 -7328,6 +7328,13 @@@ F:    fs/verity
  F:    include/linux/fsverity.h
  F:    include/uapi/linux/fsverity.h
  
 +FT260 FTDI USB-HID TO I2C BRIDGE DRIVER
 +M:    Michael Zaidman <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hid/hid-ft260.c
 +
  FUJITSU LAPTOP EXTRAS
  M:    Jonathan Woithe <[email protected]>
  L:    [email protected]
@@@ -9102,9 -9145,7 +9152,7 @@@ F:      drivers/gpio/gpio-*cove.
  INTEL PMIC MULTIFUNCTION DEVICE DRIVERS
  M:    Andy Shevchenko <[email protected]>
  S:    Maintained
- F:    drivers/mfd/intel_msic.c
  F:    drivers/mfd/intel_soc_pmic*
- F:    include/linux/mfd/intel_msic.h
  F:    include/linux/mfd/intel_soc_pmic*
  
  INTEL PMT DRIVER
@@@ -9851,6 -9892,18 +9899,18 @@@ F:    include/linux/keyctl.
  F:    include/uapi/linux/keyctl.h
  F:    security/keys/
  
+ KFENCE
+ M:    Alexander Potapenko <[email protected]>
+ M:    Marco Elver <[email protected]>
+ R:    Dmitry Vyukov <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    Documentation/dev-tools/kfence.rst
+ F:    arch/*/include/asm/kfence.h
+ F:    include/linux/kfence.h
+ F:    lib/Kconfig.kfence
+ F:    mm/kfence/
+ 
  KFIFO
  M:    Stefani Seibold <[email protected]>
  S:    Maintained
@@@ -9911,7 -9964,7 +9971,7 @@@ F:      include/linux/kprobes.
  F:    kernel/kprobes.c
  
  KS0108 LCD CONTROLLER DRIVER
- M:    Miguel Ojeda Sandonis <[email protected]>
+ M:    Miguel Ojeda <[email protected]>
  S:    Maintained
  F:    Documentation/admin-guide/auxdisplay/ks0108.rst
  F:    drivers/auxdisplay/ks0108.c
@@@ -11621,7 -11674,6 +11681,6 @@@ F:   drivers/dma/at_hdmac.
  F:    drivers/dma/at_hdmac_regs.h
  F:    drivers/dma/at_xdmac.c
  F:    include/dt-bindings/dma/at91.h
- F:    include/linux/platform_data/dma-atmel.h
  
  MICROCHIP AT91 SERIAL DRIVER
  M:    Richard Genoud <[email protected]>
@@@ -11824,6 -11876,13 +11883,13 @@@ S: Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
  F:    drivers/platform/surface/
  
+ MICROSOFT SURFACE HID TRANSPORT DRIVER
+ M:    Maximilian Luz <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/hid/surface-hid/
+ 
  MICROSOFT SURFACE HOT-PLUG DRIVER
  M:    Maximilian Luz <[email protected]>
  L:    [email protected]
@@@ -11845,6 -11904,7 +11911,7 @@@ F:   Documentation/driver-api/surface_agg
  F:    drivers/platform/surface/aggregator/
  F:    drivers/platform/surface/surface_acpi_notify.c
  F:    drivers/platform/surface/surface_aggregator_cdev.c
+ F:    drivers/platform/surface/surface_aggregator_registry.c
  F:    include/linux/surface_acpi_notify.h
  F:    include/linux/surface_aggregator/
  F:    include/uapi/linux/surface_aggregator/
@@@ -13873,6 -13933,13 +13940,13 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/pci/mediatek*
  F:    drivers/pci/controller/*mediatek*
  
+ PCIE DRIVER FOR MICROCHIP
+ M:    Daire McNamara <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    Documentation/devicetree/bindings/pci/microchip*
+ F:    drivers/pci/controller/*microchip*
+ 
  PCIE DRIVER FOR QUALCOMM MSM
  M:    Stanimir Varbanov <[email protected]>
  L:    [email protected]
@@@ -14684,9 -14751,11 +14758,11 @@@ M: Stuart Yoder <[email protected]
  M:    Laurentiu Tudor <[email protected]>
  L:    [email protected]
  S:    Maintained
+ F:    Documentation/ABI/stable/sysfs-bus-fsl-mc
  F:    Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
  F:    Documentation/networking/device_drivers/ethernet/freescale/dpaa2/overview.rst
  F:    drivers/bus/fsl-mc/
+ F:    include/uapi/linux/fsl_mc.h
  
  QT1010 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
@@@ -16301,13 -16370,6 +16377,6 @@@ S:  Maintaine
  F:    Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml
  F:    drivers/i3c/master/svc-i3c-master.c
  
- SIMPLE FIRMWARE INTERFACE (SFI)
- S:    Obsolete
- W:    http://simplefirmware.org/
- F:    arch/x86/platform/sfi/
- F:    drivers/sfi/
- F:    include/linux/sfi*.h
- 
  SIMPLEFB FB DRIVER
  M:    Hans de Goede <[email protected]>
  L:    [email protected]
@@@ -16729,6 -16791,7 +16798,7 @@@ R:   Pierre-Louis Bossart <pierre-louis.b
  R:    Sanyog Kale <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git
  F:    Documentation/driver-api/soundwire/
  F:    drivers/soundwire/
  F:    include/linux/soundwire/

diff --combined drivers/hid/Kconfig
index b279c6130bc2427a523b48e2bbc343b158545834,26e06097ba08bb77a41ee71ed8c482357443ebbc..f042c746693035b0b90dd6c6a0bc0dbf8a34586d
--- 1/drivers/hid/Kconfig
--- 2/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -351,17 -351,6 +351,17 @@@ config HID_EZKE
        help
        Support for Ezkey BTC 8193 keyboard.
  
 +config HID_FT260
 +      tristate "FTDI FT260 USB HID to I2C host support"
 +      depends on USB_HID && HIDRAW && I2C
 +      help
 +        Provides I2C host adapter functionality over USB-HID through FT260
 +        device. The customizable USB descriptor fields are exposed as sysfs
 +        attributes.
 +
 +        To compile this driver as a module, choose M here: the module
 +        will be called hid-ft260.
 +
  config HID_GEMBIRD
        tristate "Gembird Joypad"
        depends on HID
@@@ -1217,4 -1206,6 +1217,6 @@@ source "drivers/hid/intel-ish-hid/Kconf
  
  source "drivers/hid/amd-sfh-hid/Kconfig"
  
+ source "drivers/hid/surface-hid/Kconfig"
+ 
  endmenu

diff --combined drivers/hid/Makefile
index 6e24c37132eceb2d23d8d9d5f7a9fff67ce94a1c,1044ed238856e1664e447cc4c326cf68e3f76cb7..a664a495fc448b6ff38435f4a1d43ea9053e8332
--- 1/drivers/hid/Makefile
--- 2/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@ -46,7 -46,6 +46,7 @@@ obj-$(CONFIG_HID_ELAN)                += hid-elan.
  obj-$(CONFIG_HID_ELECOM)      += hid-elecom.o
  obj-$(CONFIG_HID_ELO)         += hid-elo.o
  obj-$(CONFIG_HID_EZKEY)               += hid-ezkey.o
 +obj-$(CONFIG_HID_FT260)               += hid-ft260.o
  obj-$(CONFIG_HID_GEMBIRD)     += hid-gembird.o
  obj-$(CONFIG_HID_GFRM)                += hid-gfrm.o
  obj-$(CONFIG_HID_GLORIOUS)  += hid-glorious.o
@@@ -146,3 -145,5 +146,5 @@@ obj-$(CONFIG_INTEL_ISH_HID)        += intel-is
  obj-$(INTEL_ISH_FIRMWARE_DOWNLOADER)  += intel-ish-hid/
  
  obj-$(CONFIG_AMD_SFH_HID)       += amd-sfh-hid/
+ 
+ obj-$(CONFIG_SURFACE_HID_CORE)  += surface-hid/