Groups > linux.kernel > #1621991

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

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the mvebu tree with the arm-soc tree
Date	2017-04-12 13:00 +0200
Message-ID	<tvoae-3rc-15@gated-at.bofh.it> (permalink)
References	<tvcC6-4Dw-27@gated-at.bofh.it> <tvlP4-2b9-19@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Gregory,

On Wed, 12 Apr 2017 10:23:07 +0200 Gregory CLEMENT <gregory.clement@free-electrons.com> wrote:
>
> 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?

The conflict is trivial, I would hope that it will be handled when they
merge your tree.

-- 
Cheers,
Stephen Rothwell

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 Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-12 00:40 +0200
  Re: linux-next: manual merge of the mvebu tree with the arm-soc tree Gregory CLEMENT <gregory.clement@free-electrons.com> - 2017-04-12 10:30 +0200
    Re: linux-next: manual merge of the mvebu tree with the arm-soc  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-12 13:00 +0200

csiph-web