linux-kernel - Re: linux-next: manual merge of the scsi-mkp tree with the block 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240418055707.GA24656@lst.de>
Date: Thu, 18 Apr 2024 07:57:07 +0200
From: Christoph Hellwig <hch@....de>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: "Martin K. Petersen" <martin.petersen@...cle.com>,
	Jens Axboe <axboe@...nel.dk>, Christoph Hellwig <hch@....de>,
	Damien Le Moal <dlemoal@...nel.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with the block
 tree

Thanks Stephen,

the conflict resolution looks good to me.