From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Michael Ellerman <mpe@ellerman•id.au>,
Benjamin Herrenschmidt <benh@kernel•crashing.org>,
PowerPC <linuxppc-dev@lists•ozlabs.org>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Stefan Popa <stefan.popa@analog•com>,
Jonathan Cameron <Jonathan.Cameron@huawei•com>,
Michael Hanselmann <linux-kernel@hansmi•ch>
Subject: linux-next: manual merge of the staging tree with the powerpc tree
Date: Fri, 27 Jul 2018 17:59:11 +1000 [thread overview]
Message-ID: <20180727175911.76ed6d44@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1489 bytes --]
Hi all,
Today's linux-next merge of the staging tree got a conflict in:
MAINTAINERS
between commit:
d69ccc00c497 ("MAINTAINERS: Remove the entry for the orphaned ams driver")
from the powerpc tree and commit:
28d1a7ac2a0d ("iio: dac: Add AD5758 support")
from the staging 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 fc92aab3ca2a,b9503cefc42d..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -807,6 -791,19 +807,14 @@@ S: Supporte
F: drivers/net/ethernet/amd/xgbe/
F: arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
-AMS (Apple Motion Sensor) DRIVER
-M: Michael Hanselmann <linux-kernel@hansmi•ch>
-S: Supported
-F: drivers/macintosh/ams/
-
+ ANALOG DEVICES INC AD5758 DRIVER
+ M: Stefan Popa <stefan.popa@analog•com>
+ L: linux-iio@vger•kernel.org
+ W: http://ez.analog.com/community/linux-device-drivers
+ S: Supported
+ F: drivers/iio/dac/ad5758.c
+ F: Documentation/devicetree/bindings/iio/dac/ad5758.txt
+
ANALOG DEVICES INC AD5686 DRIVER
M: Stefan Popa <stefan.popa@analog•com>
L: linux-pm@vger•kernel.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-07-27 7:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-27 7:59 Stephen Rothwell [this message]
2018-07-27 8:36 ` linux-next: manual merge of the staging tree with the powerpc tree Greg KH
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=20180727175911.76ed6d44@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Jonathan.Cameron@huawei$(echo .)com \
--cc=benh@kernel$(echo .)crashing.org \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@hansmi$(echo .)ch \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mpe@ellerman$(echo .)id.au \
--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