From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Hans de Goede <hdegoede@redhat•com>,
Mark Gross <mark.gross@intel•com>,
Sebastian Reichel <sre@kernel•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Maximilian Luz <luzmaximilian@gmail•com>,
Sebastian Reichel <sebastian.reichel@collabora•com>
Subject: linux-next: manual merge of the drivers-x86 tree with the battery tree
Date: Fri, 9 Apr 2021 16:53:59 +1000 [thread overview]
Message-ID: <20210409165359.42535004@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1701 bytes --]
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 <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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2021-04-09 6:54 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210409165359.42535004@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hdegoede@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=luzmaximilian@gmail$(echo .)com \
--cc=mark.gross@intel$(echo .)com \
--cc=sebastian.reichel@collabora$(echo .)com \
--cc=sre@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox