Subject: linux-next: manual merge of the mfd tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 17 Aug 2018 10:39:13 +1000

Hi all,

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

  MAINTAINERS

between commit:

  16b7db4c8150 ("MAINTAINERS: Add .clang-format entry")

from Linus' tree and commit:

  97c2b5cba204 ("mfd: madera: Add register definitions for Cirrus Logic Madera codecs")

from the mfd 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 041b111596bc,2c1c6aef7d74..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3557,11 -3513,23 +3557,27 @@@ M:	Christian Benvenuti <[email-masked]
  S:	Supported
  F:	drivers/infiniband/hw/usnic/
  
 +CLANG-FORMAT FILE
 +M:	Miguel Ojeda <[email-masked]>
 +S:	Maintained
 +F:	.clang-format
 +
+ CIRRUS LOGIC MADERA CODEC DRIVERS
+ M:	Charles Keepax <[email-masked]>
+ M:	Richard Fitzgerald <[email-masked]>
+ L:	[email-masked] (moderated for non-subscribers)
+ L:	[email-masked]
+ T:	git https://github.com/CirrusLogic/linux-drivers.git
+ W:	https://github.com/CirrusLogic/linux-drivers/wiki
+ S:	Supported
+ F:	Documentation/devicetree/bindings/mfd/madera.txt
+ F:	Documentation/devicetree/bindings/pinctrl/cirrus,madera-pinctrl.txt
+ F:	include/linux/mfd/madera/*
+ F:	drivers/gpio/gpio-madera*
+ F:	drivers/mfd/madera*
+ F:	drivers/mfd/cs47l*
+ F:	drivers/pinctrl/cirrus/*
+ 
  CLEANCACHE API
  M:	Konrad Rzeszutek Wilk <[email-masked]>
  L:	[email-masked]