Subject: linux-next: manual merge of the drivers-x86 tree with the battery tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 9 Apr 2021 16:53:59 +1000

Hi all,

Today's linux-next merge of the drivers-x86 tree got a conflict in:

  MAINTAINERS

between commit:

  167f77f7d0b3 ("power: supply: Add battery driver for Surface Aggregator Module")

from the battery tree and commit:

  1d609992832e ("platform/surface: Add DTX driver")

from the drivers-x86 tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index f5efa8c0b927,7dd6b67f0f51..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -11993,14 -11872,14 +12004,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 <[email-masked]>
 +L:	[email-masked]
 +L:	[email-masked]
 +S:	Maintained
 +F:	drivers/power/supply/surface_battery.c
 +F:	drivers/power/supply/surface_charger.c
 +
+ MICROSOFT SURFACE DTX DRIVER
+ M:	Maximilian Luz <[email-masked]>
+ L:	[email-masked]
+ 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 <[email-masked]>
  L:	[email-masked]