Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1281670

Re: linux-next: manual merge of the mvebu tree with the arm-soc tree

Show all headers | View raw

On Wednesday 02 December 2015 11:18:29 Mark Brown wrote:
> On Wed, Dec 02, 2015 at 11:12:44AM +0000, Mark Brown wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the mvebu tree got a conflict in  between commit
> > 377524dc4d77f50e ("ARM: mmp: move into ARCH_MULTIPLATFORM") from the arm-soc
> > tree and commit 5f4423af9dd17 ("ARM: orion: multiplatform support") from the
> > mvebu tree.
> 
> Ccing in Arnd since I forgot to do that.
> 

I was planning to merge all the multiplatform changes into one next/multiplatform
branch, but the mvebu maintainers preferred to keep this one in their tree at
least initially. The conflict will go away once it's tested sufficiently and
I'm pulling it back.
	
	Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the mvebu tree with the arm-soc tree Mark Brown <broonie@kernel.org> - 2015-12-02 12:20 +0100
  Re: linux-next: manual merge of the mvebu tree with the arm-soc tree Mark Brown <broonie@kernel.org> - 2015-12-02 12:20 +0100
    Re: linux-next: manual merge of the mvebu tree with the arm-soc tree Arnd Bergmann <arnd@arndb.de> - 2015-12-02 12:30 +0100
      Re: linux-next: manual merge of the mvebu tree with the arm-soc tree Gregory CLEMENT <gregory.clement@free-electrons.com> - 2015-12-02 15:00 +0100
        Re: linux-next: manual merge of the mvebu tree with the arm-soc tree Arnd Bergmann <arnd@arndb.de> - 2015-12-02 16:20 +0100

csiph-web