linux-next: manual merge of the block tree with the gfs2 tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the block tree got conflicts in:

  include/linux/fs.h
  mm/filemap.c

between commit:

  00a83a3c014a ("fs: Add IOCB_NOIO flag for generic_file_read_iter")

from the gfs2 tree and commits:

  dd3e6d5039de ("mm: add support for async page locking")
  2e85abf053b9 ("mm: allow read-ahead with IOCB_NOWAIT set")

from the block tree.

I fixed it up (I think - 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 90b9f8b4c540,da90323b9f92..000000000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -315,7 -318,8 +318,9 @@@ enum rw_hint 
  #define IOCB_SYNC		(1 << 5)
  #define IOCB_WRITE		(1 << 6)
  #define IOCB_NOWAIT		(1 << 7)
 +#define IOCB_NOIO		(1 << 8)
+ /* iocb->ki_waitq is valid */
 -#define IOCB_WAITQ		(1 << 8)
++#define IOCB_WAITQ		(1 << 9)
  
  struct kiocb {
  	struct file		*ki_filp;
diff --cc mm/filemap.c
index 10e7eb3aada0,a5b1fa8f7ce4..000000000000
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@@ -2028,8 -2044,6 +2044,8 @@@ find_page
  
  		page = find_get_page(mapping, index);
  		if (!page) {
- 			if (iocb->ki_flags & (IOCB_NOWAIT | IOCB_NOIO))
++			if (iocb->ki_flags & IOCB_NOIO)
 +				goto would_block;
  			page_cache_sync_readahead(mapping,
  					ra, filp,
  					index, last_index - index);

Attachment: pgpAf1FVMZlMT.pgp
Description: OpenPGP digital signature