[lkml]   [2017]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the mvebu tree with the arm-soc tree
Hi Gregory,

On Wed, 12 Apr 2017 10:23:07 +0200 Gregory CLEMENT <> 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.

Stephen Rothwell

 \ /
  Last update: 2017-04-12 12:52    [W:0.043 / U:1.720 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site