linux-kernel - linux-next: manual merge of the mux tree with the battery 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>] [day] [month] [year] [list]

Message-ID: <20180731152004.7a5a4c54@canb.auug.org.au>
Date:   Tue, 31 Jul 2018 15:20:04 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Peter Rosin <peda@...ntia.se>, Sebastian Reichel <sre@...nel.org>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Mircea Caprioru <mircea.caprioru@...log.com>,
        Stefan Popa <stefan.popa@...log.com>
Subject: linux-next: manual merge of the mux tree with the battery tree

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@...r.kernel.or
  S:	Maintained
  F:	drivers/media/i2c/ad9389b*
  
+ ANALOG DEVICES INC ADGS1408 DRIVER
+ M:	Mircea Caprioru <mircea.caprioru@...log.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@...log.com>
 +L:	linux-pm@...r.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@...afoo.de>
  L:	linux-media@...r.kernel.org

Content of type "application/pgp-signature" skipped