From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Amir Goldstein <amir73il@gmail.com>
Cc: Miklos Szeredi <miklos@szeredi.hu>,
linux-next@vger.kernel.org,
linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the vfs-miklos tree with the overlayfs tree and build failure
Date: Tue, 31 Jan 2017 21:38:43 +1100 [thread overview]
Message-ID: <20170131213843.007ba67a@canb.auug.org.au> (raw)
In-Reply-To: <CAOQ4uxhUQxJs_3SW0Gtm-UAEbvWR7BsjudNH8LUX24OwYnvyZA@mail.gmail.com>
Hi Amir,
On Tue, 31 Jan 2017 08:47:43 +0200 Amir Goldstein <amir73il@gmail.com> 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
next prev parent reply other threads:[~2017-01-31 10:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-31 0:16 linux-next: manual merge of the vfs-miklos tree with the overlayfs tree and build failure Stephen Rothwell
2017-01-31 6:47 ` Amir Goldstein
2017-01-31 10:38 ` Stephen Rothwell [this message]
2017-02-02 22:34 ` Stephen Rothwell
2017-02-03 8:35 ` Miklos Szeredi
2017-02-03 9:03 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170131213843.007ba67a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=amir73il@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=miklos@szeredi.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).