linux-kernel - Re: 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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <00e4ae73-f4e5-491a-894a-8f6f166c1bef@kernel.dk>
Date: Fri, 10 Jan 2025 08:02:45 -0700
From: Jens Axboe <axboe@...nel.dk>
To: Stephen Rothwell <sfr@...b.auug.org.au>
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: Re: linux-next: manual merge of the block tree with Linus' tree

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