From: Gregory CLEMENT <gregory.clement@free-electrons.com> To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de> Cc: Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>, ARM <linux-arm-kernel@lists.infradead.org>, Stephen Rothwell <sfr@canb.auug.org.au>, Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Gerd Hoffmann <kraxel@redhat.com>, Eric Anholt <eric@anholt.net> Subject: Re: linux-next: manual merge of the mvebu tree with the arm-soc tree Date: Wed, 12 Apr 2017 10:23:07 +0200 [thread overview] Message-ID: <87a87mhw5w.fsf@free-electrons.com> (raw) In-Reply-To: <20170412083404.76cda3b3@canb.auug.org.au> (Stephen Rothwell's message of "Wed, 12 Apr 2017 08:34:04 +1000") Hi Olof and Arnd, On mer., avril 12 2017, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Hi all, > > Today's linux-next merge of the mvebu tree got a conflict in: > > arch/arm64/configs/defconfig > > between commit: > > 3c9d36192802 ("arm64: set CONFIG_MMC_BCM2835=y in defconfig") > > from the arm-soc tree and commit: > > 6ff829553345 ("arm64: configs: enable SDHCI driver for Xenon") > > from the mvebu tree. How do you want to proceed with this conflict? Do you want that I merged arm-soc/next/arm64 in my mvebu/defconfig64 branch before applying my patch ? Or do you prefer that I continue to base my branch on v4.11-rc1 and then you will take care of the conflict when pulling the branch? Thanks, Gregory > > 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. > > BTW, that arm-soc commit has no Signed-off-by from its committer :-( > > -- > Cheers, > Stephen Rothwell > > diff --cc arch/arm64/configs/defconfig > index ab4461b6b226,93b0aab959c0..000000000000 > --- a/arch/arm64/configs/defconfig > +++ b/arch/arm64/configs/defconfig > @@@ -402,7 -401,7 +402,8 @@@ CONFIG_MMC_DW_EXYNOS= > CONFIG_MMC_DW_K3=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_MMC_SUNXI=y > +CONFIG_MMC_BCM2835=y > + CONFIG_MMC_SDHCI_XENON=y > CONFIG_NEW_LEDS=y > CONFIG_LEDS_CLASS=y > CONFIG_LEDS_GPIO=y -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
WARNING: multiple messages have this Message-ID (diff)
From: gregory.clement@free-electrons.com (Gregory CLEMENT) To: linux-arm-kernel@lists.infradead.org Subject: linux-next: manual merge of the mvebu tree with the arm-soc tree Date: Wed, 12 Apr 2017 10:23:07 +0200 [thread overview] Message-ID: <87a87mhw5w.fsf@free-electrons.com> (raw) In-Reply-To: <20170412083404.76cda3b3@canb.auug.org.au> (Stephen Rothwell's message of "Wed, 12 Apr 2017 08:34:04 +1000") Hi Olof and Arnd, On mer., avril 12 2017, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Hi all, > > Today's linux-next merge of the mvebu tree got a conflict in: > > arch/arm64/configs/defconfig > > between commit: > > 3c9d36192802 ("arm64: set CONFIG_MMC_BCM2835=y in defconfig") > > from the arm-soc tree and commit: > > 6ff829553345 ("arm64: configs: enable SDHCI driver for Xenon") > > from the mvebu tree. How do you want to proceed with this conflict? Do you want that I merged arm-soc/next/arm64 in my mvebu/defconfig64 branch before applying my patch ? Or do you prefer that I continue to base my branch on v4.11-rc1 and then you will take care of the conflict when pulling the branch? Thanks, Gregory > > 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. > > BTW, that arm-soc commit has no Signed-off-by from its committer :-( > > -- > Cheers, > Stephen Rothwell > > diff --cc arch/arm64/configs/defconfig > index ab4461b6b226,93b0aab959c0..000000000000 > --- a/arch/arm64/configs/defconfig > +++ b/arch/arm64/configs/defconfig > @@@ -402,7 -401,7 +402,8 @@@ CONFIG_MMC_DW_EXYNOS= > CONFIG_MMC_DW_K3=y > CONFIG_MMC_DW_ROCKCHIP=y > CONFIG_MMC_SUNXI=y > +CONFIG_MMC_BCM2835=y > + CONFIG_MMC_SDHCI_XENON=y > CONFIG_NEW_LEDS=y > CONFIG_LEDS_CLASS=y > CONFIG_LEDS_GPIO=y -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
next prev parent reply other threads:[~2017-04-12 8:23 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-11 22:34 linux-next: manual merge of the mvebu tree with the arm-soc tree Stephen Rothwell 2017-04-11 22:34 ` Stephen Rothwell 2017-04-12 8:23 ` Gregory CLEMENT [this message] 2017-04-12 8:23 ` Gregory CLEMENT 2017-04-12 10:51 ` Stephen Rothwell 2017-04-12 10:51 ` Stephen Rothwell -- strict thread matches above, loose matches on Subject: below -- 2022-05-09 23:41 Stephen Rothwell 2022-05-09 23:41 ` Stephen Rothwell 2022-05-10 13:59 ` Krzysztof Kozlowski 2022-05-10 13:59 ` Krzysztof Kozlowski 2022-05-10 14:42 ` Arnd Bergmann 2022-05-10 14:42 ` Arnd Bergmann 2018-05-16 22:47 Stephen Rothwell 2018-05-16 22:47 ` Stephen Rothwell 2016-04-13 23:29 Stephen Rothwell 2016-04-13 23:29 ` Stephen Rothwell 2016-04-13 23:29 ` Stephen Rothwell 2016-02-17 23:33 Stephen Rothwell 2016-02-17 23:33 ` Stephen Rothwell 2016-02-17 23:33 ` Stephen Rothwell 2015-12-02 11:12 Mark Brown 2015-12-02 11:12 ` Mark Brown 2015-12-02 11:12 ` Mark Brown 2015-12-02 11:18 ` Mark Brown 2015-12-02 11:18 ` Mark Brown 2015-12-02 11:21 ` Arnd Bergmann 2015-12-02 11:21 ` Arnd Bergmann 2015-12-02 13:49 ` Gregory CLEMENT 2015-12-02 13:49 ` Gregory CLEMENT 2015-12-02 15:09 ` Arnd Bergmann 2015-12-02 15:09 ` Arnd Bergmann 2015-10-31 23:35 Stephen Rothwell 2015-10-31 23:35 ` Stephen Rothwell 2015-10-31 23:35 ` Stephen Rothwell 2015-01-13 0:20 Stephen Rothwell 2015-01-13 0:20 ` Stephen Rothwell 2015-01-13 0:20 ` Stephen Rothwell 2015-01-13 1:05 ` Andrew Lunn 2015-01-13 1:05 ` Andrew Lunn 2014-05-06 1:07 Stephen Rothwell 2014-05-06 1:07 ` Stephen Rothwell 2014-05-06 1:07 ` Stephen Rothwell 2014-05-06 1:13 ` Olof Johansson 2014-05-06 1:13 ` Olof Johansson 2014-05-06 1:13 ` Olof Johansson 2014-03-18 0:21 Stephen Rothwell 2014-03-18 0:21 ` Stephen Rothwell 2014-03-18 0:21 ` Stephen Rothwell 2014-02-26 1:46 Stephen Rothwell 2014-02-26 1:46 ` Stephen Rothwell 2014-02-26 1:46 ` Stephen Rothwell 2013-08-19 6:05 Stephen Rothwell 2013-08-19 6:05 ` Stephen Rothwell 2013-08-19 6:05 ` Stephen Rothwell 2013-08-19 20:57 ` Jason Cooper 2013-08-19 20:57 ` Jason Cooper 2013-08-19 21:09 ` Olof Johansson 2013-08-19 21:09 ` Olof Johansson 2013-08-19 21:09 ` Olof Johansson 2013-08-19 21:38 ` Jason Cooper 2013-08-19 21:38 ` Jason Cooper 2013-08-19 21:38 ` Jason Cooper
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=87a87mhw5w.fsf@free-electrons.com \ --to=gregory.clement@free-electrons.com \ --cc=andrew@lunn.ch \ --cc=arnd@arndb.de \ --cc=eric@anholt.net \ --cc=jason@lakedaemon.net \ --cc=kraxel@redhat.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=olof@lixom.net \ --cc=sfr@canb.auug.org.au \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.