All of lore.kernel.org
 help / color / mirror / Atom feed
From: Olof Johansson <olof@lixom.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
	Gregory Clement <gregory.clement@free-electrons.com>,
	"linux-arm-kernel@lists.infradead.org" 
	<linux-arm-kernel@lists.infradead.org>,
	Arnd Bergmann <arnd@arndb.de>,
	"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Rob Herring <robh@kernel.org>,
	Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Subject: Re: linux-next: manual merge of the mvebu tree with the arm-soc tree
Date: Mon, 5 May 2014 18:13:10 -0700	[thread overview]
Message-ID: <CAOesGMgLemvWtzN=eBwKerYxcVddx=Uc6O+5aLfL2Yg9GqPTBA@mail.gmail.com> (raw)
In-Reply-To: <20140506110758.9ddcae1a0fa3b9548e37bc58@canb.auug.org.au>

On Mon, May 5, 2014 at 6:07 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the mvebu tree got a conflict in
> arch/arm/mach-mvebu/Kconfig between commit 55400f3a1f89 ("ARM: mvebu:
> clean-up unneeded kconfig selects") from the arm-soc tree and commit
> 8e6ac2033822 ("ARM: mvebu: enable the ARM SCU on Armada 375 and Armada
> 38x") from the mvebu tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks for the heads up. This will be resolved permanently once we
merge the mvebu contents into arm-soc (since that'll go on top of the
kconfig select cleanup).


-Olof

WARNING: multiple messages have this Message-ID (diff)
From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the mvebu tree with the arm-soc tree
Date: Mon, 5 May 2014 18:13:10 -0700	[thread overview]
Message-ID: <CAOesGMgLemvWtzN=eBwKerYxcVddx=Uc6O+5aLfL2Yg9GqPTBA@mail.gmail.com> (raw)
In-Reply-To: <20140506110758.9ddcae1a0fa3b9548e37bc58@canb.auug.org.au>

On Mon, May 5, 2014 at 6:07 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the mvebu tree got a conflict in
> arch/arm/mach-mvebu/Kconfig between commit 55400f3a1f89 ("ARM: mvebu:
> clean-up unneeded kconfig selects") from the arm-soc tree and commit
> 8e6ac2033822 ("ARM: mvebu: enable the ARM SCU on Armada 375 and Armada
> 38x") from the mvebu tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks for the heads up. This will be resolved permanently once we
merge the mvebu contents into arm-soc (since that'll go on top of the
kconfig select cleanup).


-Olof

  reply	other threads:[~2014-05-06  1:13 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-06  1:07 linux-next: manual merge of the mvebu tree with the arm-soc tree Stephen Rothwell
2014-05-06  1:07 ` Stephen Rothwell
2014-05-06  1:07 ` Stephen Rothwell
2014-05-06  1:13 ` Olof Johansson [this message]
2014-05-06  1:13   ` Olof Johansson
2014-05-06  1:13   ` Olof Johansson
  -- 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
2017-04-11 22:34 Stephen Rothwell
2017-04-11 22:34 ` Stephen Rothwell
2017-04-12  8:23 ` Gregory CLEMENT
2017-04-12  8:23   ` Gregory CLEMENT
2017-04-12 10:51   ` Stephen Rothwell
2017-04-12 10:51     ` 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-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='CAOesGMgLemvWtzN=eBwKerYxcVddx=Uc6O+5aLfL2Yg9GqPTBA@mail.gmail.com' \
    --to=olof@lixom.net \
    --cc=andrew@lunn.ch \
    --cc=arnd@arndb.de \
    --cc=gregory.clement@free-electrons.com \
    --cc=jason@lakedaemon.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=robh@kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=thomas.petazzoni@free-electrons.com \
    /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: link
Be 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.