From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Peter Rosin <peda@axentia•se>, Sebastian Reichel <sre@kernel•org>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Mircea Caprioru <mircea.caprioru@analog•com>,
Stefan Popa <stefan.popa@analog•com>
Subject: linux-next: manual merge of the mux tree with the battery tree
Date: Tue, 31 Jul 2018 15:20:04 +1000 [thread overview]
Message-ID: <20180731152004.7a5a4c54@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1471 bytes --]
Hi all,
Today's linux-next merge of the mux tree got a conflict in:
MAINTAINERS
between commit:
fe8e81b7e899 ("adp5061: New driver for ADP5061 I2C battery charger")
from the battery tree and commit:
703160ff3e50 ("dt-bindings: mux: add adi,adgs1408")
from the mux 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 db24b8939ed4,eaa2b55a0e9b..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -829,13 -810,12 +829,19 @@@ L: linux-media@vger•kernel.or
S: Maintained
F: drivers/media/i2c/ad9389b*
+ ANALOG DEVICES INC ADGS1408 DRIVER
+ M: Mircea Caprioru <mircea.caprioru@analog•com>
+ S: Supported
+ F: drivers/mux/adgs1408.c
+ F: Documentation/devicetree/bindings/mux/adgs1408.txt
+
+ANALOG DEVICES INC ADP5061 DRIVER
+M: Stefan Popa <stefan.popa@analog•com>
+L: linux-pm@vger•kernel.org
+W: http://ez.analog.com/community/linux-device-drivers
+S: Supported
+F: drivers/power/supply/adp5061.c
+
ANALOG DEVICES INC ADV7180 DRIVER
M: Lars-Peter Clausen <lars@metafoo•de>
L: linux-media@vger•kernel.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2018-07-31 5:20 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=20180731152004.7a5a4c54@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mircea.caprioru@analog$(echo .)com \
--cc=peda@axentia$(echo .)se \
--cc=sre@kernel$(echo .)org \
--cc=stefan.popa@analog$(echo .)com \
/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