From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Miklos Szeredi <miklos@szeredi•hu>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Amir Goldstein <amir73il@gmail•com>
Subject: Re: linux-next: manual merge of the vfs-miklos tree with the overlayfs tree and build failure
Date: Fri, 3 Feb 2017 09:34:36 +1100 [thread overview]
Message-ID: <20170203093436.0c486463@canb.auug.org.au> (raw)
In-Reply-To: <20170131111656.3e77663b@canb.auug.org.au>
Hi Miklos,
On Tue, 31 Jan 2017 11:16:56 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> 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.
>
> 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,
> ^
>
> so I decided to just drop the vfs-miklos tree for today.
This mess is still there ...
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2017-02-02 22:34 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
2017-02-02 22:34 ` Stephen Rothwell [this message]
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=20170203093436.0c486463@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=amir73il@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miklos@szeredi$(echo .)hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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