linux-kernel - linux-next: manual merge of the pinctrl tree with the mvebu 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: <20170525114739.1d8d0a3e@canb.auug.org.au>
Date:   Thu, 25 May 2017 11:47:39 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Linus Walleij <linus.walleij@...aro.org>,
        Jason Cooper <jason@...edaemon.net>,
        Andrew Lunn <andrew@...n.ch>,
        Gregory Clement <gregory.clement@...e-electrons.com>,
        ARM <linux-arm-kernel@...ts.infradead.org>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Thomas Petazzoni <thomas.petazzoni@...e-electrons.com>
Subject: linux-next: manual merge of the pinctrl tree with the mvebu tree

Hi Linus,

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

  MAINTAINERS

between commit:

  e7c1572f6565 ("MAINTAINERS: sort F entries for Marvell EBU maintainers")

from the mvebu tree and commit:

  15accb3cbbcd ("MAINTAINERS: extend mvebu SoC entry with pinctrl drivers")

from the pinctrl 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 d724ab4b717f,d023b172e3af..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1489,15 -1489,14 +1489,16 @@@ M:	Gregory Clement <gregory.clement@fre
  M:	Sebastian Hesselbarth <sebastian.hesselbarth@...il.com>
  L:	linux-arm-kernel@...ts.infradead.org (moderated for non-subscribers)
  S:	Maintained
 -F:	arch/arm/mach-mvebu/
 -F:	drivers/rtc/rtc-armada38x.c
  F:	arch/arm/boot/dts/armada*
  F:	arch/arm/boot/dts/kirkwood*
 +F:	arch/arm/configs/mvebu_*_defconfig
 +F:	arch/arm/mach-mvebu/
  F:	arch/arm64/boot/dts/marvell/armada*
  F:	drivers/cpufreq/mvebu-cpufreq.c
 +F:	drivers/irqchip/irq-armada-370-xp.c
 +F:	drivers/irqchip/irq-mvebu-*
+ F:	drivers/pinctrl/mvebu/
 -F:	arch/arm/configs/mvebu_*_defconfig
 +F:	drivers/rtc/rtc-armada38x.c
  
  ARM/Marvell Berlin SoC support
  M:	Jisheng Zhang <jszhang@...vell.com>