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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20180817103913.52544928@canb.auug.org.au>
Date:   Fri, 17 Aug 2018 10:39:13 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Lee Jones <lee.jones@...aro.org>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Miguel Ojeda <miguel.ojeda.sandonis@...il.com>,
        Richard Fitzgerald <rf@...nsource.cirrus.com>
Subject: linux-next: manual merge of the mfd tree with Linus' tree

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 <benve@...co.com
  S:	Supported
  F:	drivers/infiniband/hw/usnic/
  
 +CLANG-FORMAT FILE
 +M:	Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
 +S:	Maintained
 +F:	.clang-format
 +
+ CIRRUS LOGIC MADERA CODEC DRIVERS
+ M:	Charles Keepax <ckeepax@...nsource.cirrus.com>
+ M:	Richard Fitzgerald <rf@...nsource.cirrus.com>
+ L:	alsa-devel@...a-project.org (moderated for non-subscribers)
+ L:	patches@...nsource.cirrus.com
+ 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 <konrad.wilk@...cle.com>
  L:	linux-kernel@...r.kernel.org

Content of type "application/pgp-signature" skipped