From: Amir Goldstein <amir73il@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
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 08:47:43 +0200 [thread overview]
Message-ID: <CAOQ4uxhUQxJs_3SW0Gtm-UAEbvWR7BsjudNH8LUX24OwYnvyZA@mail.gmail.com> (raw)
In-Reply-To: <20170131111656.3e77663b@canb.auug.org.au>
On Tue, Jan 31, 2017 at 2:16 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Miklos,
>
> Today's linux-next merge of the vfs-miklos tree got a conflict in:
>
> fs/read_write.c
>
> between commit:
>
> 97e147358bea ("vfs: wrap write f_ops with file_{start,end}_write()")
>
> from the overlayfs tree and various duplicated patches between v4.10-rc1
> and the vfs-miklos tree.
>
That's strange.
overlayfs-next whose head is the for mentioned commit is based on
v4.10-rc6 and has no duplicated patches AFAICS
Perhaps you are referring to the similar named patch:
3616119 vfs: no mnt_want_write_file() in vfs_{copy,clone}_file_range()
Miklos has converted mnt_want_write_file() => sb_start_write() for v4.10-rc1
and my change converts it again sb_start_write() => file_start_write(),
which is mostly a semantic difference, but with some implications.
> Please clean up the vfs-miklos tree.
>
> I fixed it up (I just used the former) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
>
> I then got this build failure from my arm multi_v7_defconfig build:
>
> In file included from /home/sfr/next/next/include/linux/seq_file.h:10:0,
> from /home/sfr/next/next/include/linux/pinctrl/consumer.h:17,
> from /home/sfr/next/next/include/linux/pinctrl/devinfo.h:21,
> from /home/sfr/next/next/include/linux/device.h:24,
> from /home/sfr/next/next/include/linux/dma-mapping.h:6,
> from /home/sfr/next/next/arch/arm/kernel/asm-offsets.c:16:
> /home/sfr/next/next/include/linux/fs.h:2566:19: error: redefinition of 'do_clone
> _file_range'
> static inline int do_clone_file_range(struct file *file_in, loff_t pos_in,
> ^
> /home/sfr/next/next/include/linux/fs.h:1743:19: note: previous definition of 'do_clone_file_range' was here
> static inline int do_clone_file_range(struct file *file_in, loff_t pos_in,
> ^
>
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?
> so I decided to just drop the vfs-miklos tree for today.
> --
> Cheers,
> Stephen Rothwell
next prev parent reply other threads:[~2017-01-31 6:47 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 [this message]
2017-01-31 10:38 ` Stephen Rothwell
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=CAOQ4uxhUQxJs_3SW0Gtm-UAEbvWR7BsjudNH8LUX24OwYnvyZA@mail.gmail.com \
--to=amir73il@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=sfr@canb.auug.org.au \
/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).