Subject: Re: linux-next: manual merge of the vfs-miklos tree with the overlayfs tree and build failure

From: Stephen Rothwell <[email-masked]>
Date: Tue, 31 Jan 2017 21:38:43 +1100

Hi Amir,

On Tue, 31 Jan 2017 08:47:43 +0200 Amir Goldstein <[email-masked]> wrote:
>
> That's strange.
> overlayfs-next whose head is the for mentioned commit is based on
> v4.10-rc6 and has no duplicated patches AFAICS

The duplicate patches are between v4.10-rc1 and the vfs-miklos tree and
the overlayfs tree includes v4.10-rc1, so there is interactions there.

> Please note that my patch moves do_clone_file_range() from line 1743
> to line 2566,
> because it needs to use file_start_write(), which is defined in line 2533.
> so perhaps the conflict was not resolved correctly?

That is probably what happened, but if the vfs-miklos tree is cleaned
up, these conflicts will all go away.

-- 
Cheers,
Stephen Rothwell