From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <axboe@kernel•dk>
Cc: John Garry <john.g.garry@oracle•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Mikulas Patocka <mpatocka@redhat•com>,
Milan Broz <gmazyland@gmail•com>
Subject: linux-next: manual merge of the block tree with Linus' tree
Date: Thu, 9 Jan 2025 12:46:17 +1100 [thread overview]
Message-ID: <20250109124617.1b4ff0b8@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1758 bytes --]
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);
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-01-09 1:46 UTC|newest]
Thread overview: 122+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-09 1:46 Stephen Rothwell [this message]
2025-01-10 15:02 ` linux-next: manual merge of the block tree with Linus' tree Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
2025-05-05 3:25 Stephen Rothwell
2025-05-05 13:15 ` Jens Axboe
2024-11-11 3:10 Stephen Rothwell
2024-11-11 15:14 ` Jens Axboe
2024-10-21 1:06 Stephen Rothwell
2024-10-21 16:52 ` Jens Axboe
2024-05-22 23:50 Stephen Rothwell
2024-05-23 13:04 ` Jens Axboe
2024-05-13 2:23 Stephen Rothwell
2024-05-13 23:50 ` Jens Axboe
2023-10-23 1:42 Stephen Rothwell
2023-06-26 3:04 Stephen Rothwell
2023-04-03 2:36 Stephen Rothwell
2022-11-21 2:46 Stephen Rothwell
2022-11-21 14:47 ` Jens Axboe
2022-04-20 2:31 Stephen Rothwell
2022-03-21 1:22 Stephen Rothwell
2021-11-25 23:38 Stephen Rothwell
2021-11-26 5:30 ` Christoph Hellwig
2021-11-01 1:36 Stephen Rothwell
2021-10-25 2:26 Stephen Rothwell
2021-08-17 5:25 Stephen Rothwell
2021-08-17 16:40 ` Tejun Heo
2021-08-17 16:50 ` Christoph Hellwig
2021-08-17 16:52 ` Tejun Heo
2021-08-09 4:29 Stephen Rothwell
2021-08-09 14:05 ` Jens Axboe
2020-12-14 3:56 Stephen Rothwell
2020-09-23 4:05 Stephen Rothwell
2020-01-28 0:38 Stephen Rothwell
2020-01-28 0:40 ` Jens Axboe
2019-04-15 3:06 Stephen Rothwell
2019-04-15 14:15 ` Jens Axboe
2019-04-15 3:00 Stephen Rothwell
2019-03-05 1:48 Stephen Rothwell
2018-11-16 2:19 Stephen Rothwell
2018-11-16 2:21 ` Jens Axboe
2017-09-04 3:09 Stephen Rothwell
2017-06-30 2:08 Stephen Rothwell
2017-06-26 2:44 Stephen Rothwell
2017-06-26 2:28 Stephen Rothwell
2017-06-23 3:06 Stephen Rothwell
2017-06-23 3:09 ` Jens Axboe
2017-06-23 3:24 ` Stephen Rothwell
2017-06-23 3:27 ` Jens Axboe
2017-06-23 3:33 ` Stephen Rothwell
2017-06-23 3:56 ` Jens Axboe
2017-06-23 3:29 ` Jens Axboe
2016-07-21 3:08 Stephen Rothwell
2016-07-08 3:07 Stephen Rothwell
2016-07-08 4:14 ` Stephen Rothwell
2016-07-08 14:11 ` Konrad Rzeszutek Wilk
2016-06-14 2:44 Stephen Rothwell
2016-05-03 4:25 Stephen Rothwell
2016-05-03 20:03 ` Jens Axboe
2016-03-07 3:12 Stephen Rothwell
2016-03-07 3:08 Stephen Rothwell
2016-03-01 0:25 Stephen Rothwell
2016-02-18 2:10 Stephen Rothwell
2016-01-13 2:07 Stephen Rothwell
2015-12-31 3:34 Stephen Rothwell
2016-01-21 22:46 ` Stephen Rothwell
2016-01-21 22:48 ` Jens Axboe
2015-12-14 1:36 Stephen Rothwell
2015-12-07 4:27 Stephen Rothwell
2015-12-07 4:16 Stephen Rothwell
2015-10-06 1:33 Stephen Rothwell
2015-08-27 2:36 Stephen Rothwell
2015-08-17 4:04 Stephen Rothwell
2015-06-04 4:51 Stephen Rothwell
2015-06-04 4:36 Stephen Rothwell
2015-06-03 3:33 Stephen Rothwell
2015-06-03 3:28 Stephen Rothwell
2015-06-01 4:56 Stephen Rothwell
2015-06-01 14:31 ` Mike Snitzer
2015-04-13 4:58 Stephen Rothwell
2015-01-27 4:03 Stephen Rothwell
2014-03-17 3:55 Stephen Rothwell
2014-03-10 15:39 Mark Brown
2013-11-01 3:25 Stephen Rothwell
2013-09-25 3:11 Stephen Rothwell
2013-05-01 5:17 Stephen Rothwell
2013-03-26 2:05 Stephen Rothwell
2012-12-07 2:44 Stephen Rothwell
2012-10-31 2:04 Stephen Rothwell
2012-10-31 13:55 ` Ben Hutchings
2012-10-31 13:57 ` Jens Axboe
2012-11-01 10:04 ` Herton Ronaldo Krzesinski
2011-11-01 5:15 Stephen Rothwell
2011-11-01 8:09 ` Jens Axboe
2011-11-01 9:03 ` Stephen Rothwell
2011-05-19 1:34 Stephen Rothwell
2011-03-21 0:43 Stephen Rothwell
2011-03-21 9:48 ` Jens Axboe
2011-03-07 2:19 Stephen Rothwell
2011-03-07 6:36 ` Tejun Heo
2011-03-07 8:42 ` Jens Axboe
2011-03-07 10:41 ` Sedat Dilek
2011-03-07 10:47 ` Tejun Heo
2011-03-07 11:14 ` Sedat Dilek
2011-03-07 11:16 ` Jens Axboe
2011-03-07 11:25 ` Sedat Dilek
2011-03-07 11:26 ` Jens Axboe
2011-03-07 11:35 ` Sedat Dilek
2011-03-07 11:46 ` Jens Axboe
2011-03-07 12:26 ` Sedat Dilek
2011-03-07 11:42 ` Stephen Rothwell
2011-03-07 11:38 ` Stephen Rothwell
2010-09-16 2:04 Stephen Rothwell
2010-04-29 3:52 Stephen Rothwell
2010-04-29 7:33 ` Jens Axboe
2010-03-17 1:52 Stephen Rothwell
2010-03-17 2:03 ` Li Zefan
2010-02-25 3:10 Stephen Rothwell
2010-02-25 7:47 ` Jens Axboe
2010-02-25 23:11 ` Stephen Rothwell
2009-06-25 3:15 Stephen Rothwell
2009-06-25 3:30 ` Stephen Rothwell
2009-06-25 6:38 ` Jens Axboe
2009-06-25 7:42 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250109124617.1b4ff0b8@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=gmazyland@gmail$(echo .)com \
--cc=john.g.garry@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mpatocka@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox