From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Al Viro <viro@ZenIV•linux.org.uk>, Jan Kara <jack@suse•cz>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Amir Goldstein <amir73il@gmail•com>,
Adam Manzanares <adam.manzanares@wdc•com>
Subject: Re: linux-next: manual merge of the vfs tree with the ext3 tree
Date: Tue, 12 Jun 2018 09:53:09 +1000 [thread overview]
Message-ID: <20180612095309.26f5c6f4@canb.auug.org.au> (raw)
In-Reply-To: <20180601115619.73a8f966@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2099 bytes --]
Hi all,
On Fri, 1 Jun 2018 11:56:19 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the vfs tree got a conflict in:
>
> include/linux/fs.h
>
> between commit:
>
> 29aca8b3f7cd ("fsnotify: introduce prototype struct fsnotify_obj")
>
> from the ext3 tree and commit:
>
> d9a08a9e616b ("fs: Add aio iopriority support")
>
> from the vfs tree.
>
> I fixed it up (see below) 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc include/linux/fs.h
> index d1f3d572349f,482563fe549c..000000000000
> --- a/include/linux/fs.h
> +++ b/include/linux/fs.h
> @@@ -36,7 -36,7 +36,8 @@@
> #include <linux/delayed_call.h>
> #include <linux/uuid.h>
> #include <linux/errseq.h>
> +#include <linux/fsnotify_obj.h>
> + #include <linux/ioprio.h>
>
> #include <asm/byteorder.h>
> #include <uapi/linux/fs.h>
> @@@ -1717,9 -1713,10 +1719,11 @@@ struct file_operations
> int (*iterate) (struct file *, struct dir_context *);
> int (*iterate_shared) (struct file *, struct dir_context *);
> __poll_t (*poll) (struct file *, struct poll_table_struct *);
> + struct wait_queue_head * (*get_poll_head)(struct file *, __poll_t);
> + __poll_t (*poll_mask) (struct file *, __poll_t);
> long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
> long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
> + int (*pre_mmap) (struct file *, unsigned long, unsigned long);
> int (*mmap) (struct file *, struct vm_area_struct *);
> unsigned long mmap_supported_flags;
> int (*open) (struct inode *, struct file *);
This is now a conflict between the ext3 tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2018-06-11 23:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-01 1:56 linux-next: manual merge of the vfs tree with the ext3 tree Stephen Rothwell
2018-06-01 15:32 ` Jan Kara
2018-06-11 23:53 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-10-03 22:56 Stephen Rothwell
2022-09-26 13:01 broonie
2019-01-02 1:09 Stephen Rothwell
2018-11-27 23:10 Stephen Rothwell
2017-11-08 22:55 Stephen Rothwell
2015-03-18 0:32 Stephen Rothwell
2012-01-05 2:06 Stephen Rothwell
2011-07-18 3:36 Stephen Rothwell
2011-07-18 19:32 ` Jan Kara
2010-05-28 1:31 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=20180612095309.26f5c6f4@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=adam.manzanares@wdc$(echo .)com \
--cc=amir73il@gmail$(echo .)com \
--cc=jack@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/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