linux-next: manual merge of the staging tree with the powerpc tree

linux-next: manual merge of the staging tree with the powerpc tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: manual merge of the staging tree with the powerpc tree

[Greg KH]

On Fri, Jul 27, 2018 at 05:59:11PM +1000, Stephen Rothwell wrote:
> 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.

Looks good to me, thanks!

greg k-h