linux-next: manual merge of the scsi-mkp tree with the vfs-brauner tree

linux-next: manual merge of the scsi-mkp tree with the vfs-brauner tree

[Stephen Rothwell]

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

Hi all,

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

  fs/iomap/buffered-io.c

between commits:

  dec3a7b3aa45 ("iomap: move the iomap_sector sector calculation out of iomap_add_to_ioend")
  ae5535efd8c4 ("iomap: don't chain bios")

from the vfs-brauner tree and commit:

  449813515d3e ("block, fs: Restore the per-bio/request data lifetime fields")

from the scsi-mkp 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 fs/iomap/buffered-io.c
index ae4e2026e59e,18e1fef53fbc..000000000000
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@@ -1687,11 -1666,11 +1687,12 @@@ static struct iomap_ioend *iomap_alloc_
  	bio = bio_alloc_bioset(wpc->iomap.bdev, BIO_MAX_VECS,
  			       REQ_OP_WRITE | wbc_to_write_flags(wbc),
  			       GFP_NOFS, &iomap_ioend_bioset);
 -	bio->bi_iter.bi_sector = sector;
 +	bio->bi_iter.bi_sector = iomap_sector(&wpc->iomap, pos);
 +	bio->bi_end_io = iomap_writepage_end_bio;
+ 	bio->bi_write_hint = inode->i_write_hint;
  	wbc_init_bio(wbc, bio);
  
 -	ioend = container_of(bio, struct iomap_ioend, io_inline_bio);
 +	ioend = iomap_ioend_from_bio(bio);
  	INIT_LIST_HEAD(&ioend->io_list);
  	ioend->io_type = wpc->iomap.type;
  	ioend->io_flags = wpc->iomap.flags;

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

linux-next: manual merge of the scsi-mkp tree with the vfs-brauner tree

[Stephen Rothwell]

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

Hi all,

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

  include/linux/fs.h

between commit:

  0e4a862174f2 ("libfs: Convert simple directory offsets to use a Maple Tree")

from the vfs-brauner tree and commit:

  fe3944fb245a ("fs: Move enum rw_hint into a new header file")

from the scsi-mkp 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 f69c082e0f16,bdabda5dc364..000000000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -43,7 -43,7 +43,8 @@@
  #include <linux/cred.h>
  #include <linux/mnt_idmapping.h>
  #include <linux/slab.h>
 +#include <linux/maple_tree.h>
+ #include <linux/rw_hint.h>
  
  #include <asm/byteorder.h>
  #include <uapi/linux/fs.h>

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