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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20240227153436.33b48d59@canb.auug.org.au>
Date: Tue, 27 Feb 2024 15:34:36 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: "Martin K. Petersen" <martin.petersen@...cle.com>, Christian Brauner
 <brauner@...nel.org>
Cc: Bart Van Assche <bvanassche@....org>, Christoph Hellwig <hch@....de>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the scsi-mkp tree with the vfs-brauner
 tree

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;

Content of type "application/pgp-signature" skipped