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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the notifications tree got a conflict in:

  include/linux/pipe_fs_i.h

between commit:

  f6dd975583bd ("pipe: merge anon_pipe_buf*_ops")

from the vfs tree and commits:

  8cfba76383e9 ("pipe: Allow buffers to be marked read-whole-or-error for notifications")
  e7d553d69cf6 ("pipe: Add notification lossage handling")

from the notifications 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/pipe_fs_i.h
index 0c31b9461262,6626f511de6f..000000000000
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@@ -8,7 -8,10 +8,11 @@@
  #define PIPE_BUF_FLAG_ATOMIC	0x02	/* was atomically mapped */
  #define PIPE_BUF_FLAG_GIFT	0x04	/* page is a gift */
  #define PIPE_BUF_FLAG_PACKET	0x08	/* read() as a packet */
 -#define PIPE_BUF_FLAG_WHOLE	0x10	/* read() must return entire buffer or error */
 +#define PIPE_BUF_FLAG_CAN_MERGE	0x10	/* can merge buffers */
++#define PIPE_BUF_FLAG_WHOLE	0x20	/* read() must return entire buffer or error */
+ #ifdef CONFIG_WATCH_QUEUE
 -#define PIPE_BUF_FLAG_LOSS	0x20	/* Message loss happened after this buffer */
++#define PIPE_BUF_FLAG_LOSS	0x40	/* Message loss happened after this buffer */
+ #endif
  
  /**
   *	struct pipe_buffer - a linux kernel pipe buffer

Attachment: pgpQTrdaqtzDa.pgp
Description: OpenPGP digital signature