On 1/8/25 6:46 PM, Stephen Rothwell wrote: > 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. Thanks, I resolved this in my for-next branch now. -- Jens Axboe