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

Groups > linux.kernel > #1281896

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

Show all headers | View raw

On Wednesday 02 December 2015 14:49:52 Gregory CLEMENT wrote:
> 
> > least initially. The conflict will go away once it's tested sufficiently and
> > I'm pulling it back.
> 
> By the way, when you will pull our tree, we will still have it our own
> mvebu/for-next branch. Will git managed to automagically resolve the
> conflict by getting the resolution you will do in your branch?

Yes, that should be fine, unless you resolve the same conflict differently.

> A another solution could be to have a separate patch for the
> arch/arm/Kconfig file that you keep in arm-soc.

No, I don't think that will be necessary.

	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 | 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