linux-kernel - linux-next: manual merge of the block tree with Linus' 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: <20250109124617.1b4ff0b8@canb.auug.org.au>
Date: Thu, 9 Jan 2025 12:46:17 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jens Axboe <axboe@...nel.dk>
Cc: John Garry <john.g.garry@...cle.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Mikulas Patocka <mpatocka@...hat.com>, Milan
 Broz <gmazyland@...il.com>
Subject: linux-next: manual merge of the block tree with Linus' tree

Hi all,

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

  drivers/md/dm-verity-fec.c

between commit:

  6df90c02bae4 ("dm-verity FEC: Fix RS FEC repair for roots unaligned to block size (take 2)")

from Linus' tree and commit:

  5c292ac6e69f ("block: Delete bio_prio()")

from the block 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 drivers/md/dm-verity-fec.c
index e61855da6461,b0ee199009fc..000000000000
--- a/drivers/md/dm-verity-fec.c
+++ b/drivers/md/dm-verity-fec.c
@@@ -121,8 -132,7 +121,8 @@@ static int fec_decode_bufs(struct dm_ve
  	u8 *par, *block;
  	struct bio *bio = dm_bio_from_per_bio_data(io, v->ti->per_io_data_size);
  
 -	par = fec_read_parity(v, rsb, block_offset, &offset, &buf, bio->bi_ioprio);
 +	par = fec_read_parity(v, rsb, block_offset, &offset,
- 			      par_buf_offset, &buf, bio_prio(bio));
++			      par_buf_offset, &buf, bio->bi_ioprio);
  	if (IS_ERR(par))
  		return PTR_ERR(par);
  
@@@ -163,8 -160,7 +163,8 @@@
  		if (offset >= v->fec->io_size) {
  			dm_bufio_release(buf);
  
 -			par = fec_read_parity(v, rsb, block_offset, &offset, &buf, bio->bi_ioprio);
 +			par = fec_read_parity(v, rsb, block_offset, &offset,
- 					      par_buf_offset, &buf, bio_prio(bio));
++					      par_buf_offset, &buf, bio->bi_ioprio);
  			if (IS_ERR(par))
  				return PTR_ERR(par);
  		}

Content of type "application/pgp-signature" skipped