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]

Date: Mon, 13 May 2024 17:50:15 -0600
From: Jens Axboe <axboe@...nel.dk>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
 Linux Next Mailing List <linux-next@...r.kernel.org>,
 Uday Shankar <ushankar@...estorage.com>
Subject: Re: linux-next: manual merge of the block tree with Linus' tree

On 5/12/24 8:23 PM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the block tree got a conflict in:
> 
>   drivers/block/ublk_drv.c
> 
> between commit:
> 
>   eaf4a9b19b99 ("ublk: remove segment count and size limits")
> 
> from Linus' tree and commit:
> 
>   073341c3031b ("ublk_drv: set DMA alignment mask to 3")
> 
> from the block tree.

The block tree currently contains just that one pending patch, and I'll
pick it into a block-6.10 branch now that Linus has merged the other
bits. Hence this conflict will go away.

-- 
Jens Axboe