From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752018AbdEYBro (ORCPT ); Wed, 24 May 2017 21:47:44 -0400 Received: from ozlabs.org ([103.22.144.67]:43153 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751332AbdEYBrm (ORCPT ); Wed, 24 May 2017 21:47:42 -0400 Date: Thu, 25 May 2017 11:47:39 +1000 From: Stephen Rothwell To: Linus Walleij , Jason Cooper , Andrew Lunn , Gregory Clement , ARM Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Thomas Petazzoni Subject: linux-next: manual merge of the pinctrl tree with the mvebu tree Message-ID: <20170525114739.1d8d0a3e@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 L: linux-arm-kernel@lists.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