Merge remote-tracking branch 'drivers-x86/for-next'

# Conflicts:
#	MAINTAINERS
#	drivers/platform/x86/thinkpad_acpi.c

diff --cc Documentation/userspace-api/ioctl/ioctl-number.rst
Simple merge

diff --cc MAINTAINERS
index 68bd9fc8514456ffa24e4a84101c668e44f18aa9,7dd6b67f0f515f97d60853a6d0c3aef432cd8494..2ce8a536956f071db6e376b97fdd5812d759560b
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -12042,14 -11872,14 +12053,22 @@@ F:        drivers/scsi/smartpqi/smartpqi*.[ch
  F:    include/linux/cciss*.h
  F:    include/uapi/linux/cciss*.h
  
 +MICROSOFT SURFACE BATTERY AND AC DRIVERS
 +M:    Maximilian Luz <luzmaximilian@gmail.com>
 +L:    linux-pm@vger.kernel.org
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/power/supply/surface_battery.c
 +F:    drivers/power/supply/surface_charger.c
 +
+ MICROSOFT SURFACE DTX DRIVER
+ M:    Maximilian Luz <luzmaximilian@gmail.com>
+ L:    platform-driver-x86@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/driver-api/surface_aggregator/clients/dtx.rst
+ F:    drivers/platform/surface/surface_dtx.c
+ F:    include/uapi/linux/surface_aggregator/dtx.h
+ 
  MICROSOFT SURFACE GPE LID SUPPORT DRIVER
  M:    Maximilian Luz <luzmaximilian@gmail.com>
  L:    platform-driver-x86@vger.kernel.org