linux-next: manual merge of the f2fs tree with the mm tree

linux-next: manual merge of the f2fs tree with the mm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1308 bytes --]

Hi all,

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

  fs/f2fs/file.c

between commit:

  0d625446d0a4 ("backing_dev: remove current->backing_dev_info")

from the mm tree and commit:

  d61812691182 ("f2fs: enable nowait async buffered writes")

from the f2fs 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 fs/f2fs/file.c
index 7134fe8bd008,41e7c2b80f31..000000000000
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@@ -4514,12 -4535,12 +4535,9 @@@ static ssize_t f2fs_buffered_write_iter
  	struct inode *inode = file_inode(file);
  	ssize_t ret;
  
- 	if (iocb->ki_flags & IOCB_NOWAIT)
- 		return -EOPNOTSUPP;
- 
 -	current->backing_dev_info = inode_to_bdi(inode);
  	ret = generic_perform_write(iocb, from);
 -	current->backing_dev_info = NULL;
  
  	if (ret > 0) {
 -		iocb->ki_pos += ret;
  		f2fs_update_iostat(F2FS_I_SB(inode), inode,
  						APP_BUFFERED_IO, ret);
  	}

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the f2fs tree with the mm tree

[Christoph Hellwig]

The merge looks good to me, thanks.