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

Message-ID: <20170724102446.6650d65e@canb.auug.org.au>
Date:   Mon, 24 Jul 2017 10:24:46 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Philipp Zabel <p.zabel@...gutronix.de>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Randy Dunlap <rdunlap@...radead.org>,
        Linus Torvalds <torvalds@...ux-foundation.org>,
        Eugeniy Paltsev <Eugeniy.Paltsev@...opsys.com>
Subject: linux-next: manual merge of the reset tree with Linus' tree

Hi Philipp,

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

  MAINTAINERS

between commit:

  82abbea734d6 ("MAINTAINERS: fix alphabetical ordering")

from Linus' tree and commit:

  e0be864f1424 ("ARC: reset: introduce HSDKv1 reset driver")

from the reset tree.

I suspect that I may get a few of these.

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 f66488dfdbc9,57853844969b..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -12606,35 -12752,6 +12606,42 @@@ F:	arch/arc/plat-axs10
  F:	arch/arc/boot/dts/ax*
  F:	Documentation/devicetree/bindings/arc/axs10*
  
 +SYNOPSYS DESIGNWARE DMAC DRIVER
 +M:	Viresh Kumar <vireshk@...nel.org>
 +M:	Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
 +S:	Maintained
 +F:	include/linux/dma/dw.h
 +F:	include/linux/platform_data/dma-dw.h
 +F:	drivers/dma/dw/
 +
 +SYNOPSYS DESIGNWARE ENTERPRISE ETHERNET DRIVER
 +M:	Jie Deng <jiedeng@...opsys.com>
 +L:	netdev@...r.kernel.org
 +S:	Supported
 +F:	drivers/net/ethernet/synopsys/
 +
 +SYNOPSYS DESIGNWARE I2C DRIVER
 +M:	Jarkko Nikula <jarkko.nikula@...ux.intel.com>
 +R:	Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
 +R:	Mika Westerberg <mika.westerberg@...ux.intel.com>
 +L:	linux-i2c@...r.kernel.org
 +S:	Maintained
 +F:	drivers/i2c/busses/i2c-designware-*
 +F:	include/linux/platform_data/i2c-designware.h
 +
 +SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER
 +M:	Jaehoon Chung <jh80.chung@...sung.com>
 +L:	linux-mmc@...r.kernel.org
 +S:	Maintained
 +F:	drivers/mmc/host/dw_mmc*
 +
++SYNOPSYS HSDK RESET CONTROLLER DRIVER
++M:	Eugeniy Paltsev <Eugeniy.Paltsev@...opsys.com>
++S:	Supported
++F:	drivers/reset/reset-hsdk-v1.c
++F:	include/dt-bindings/reset/snps,hsdk-v1-reset.h
++F:	Documentation/devicetree/bindings/reset/snps,hsdk-v1-reset.txt
++
  SYSTEM CONFIGURATION (SYSCON)
  M:	Lee Jones <lee.jones@...aro.org>
  M:	Arnd Bergmann <arnd@...db.de>