linux-next: manual merge of the vfs tree with the ext3 tree

[Stephen Rothwell]

Hi all,

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 *);

Attachment: pgpu3Iq86W6Bl.pgp
Description: OpenPGP digital signature