linux-kernel - Re: linux-next: manual merge of the refactor-heap 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <ZkwKe15cyhgRP4Qy@visitorckw-System-Product-Name>
Date: Tue, 21 May 2024 10:44:11 +0800
From: Kuan-Wei Chiu <visitorckw@...il.com>
To: Kent Overstreet <kent.overstreet@...ux.dev>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>, Jens Axboe <axboe@...nel.dk>,
	Coly Li <colyli@...e.de>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Matthew Mirvish <matthew@...2.xyz>,
	Bagas Sanjaya <bagasdotme@...il.com>
Subject: Re: linux-next: manual merge of the refactor-heap tree with the
 block tree

On Tue, May 21, 2024 at 12:18:03PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> On Thu, 9 May 2024 15:27:45 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> > 
> > Today's linux-next merge of the refactor-heap tree got conflicts in:
> > 
> >   drivers/md/bcache/bset.c
> >   drivers/md/bcache/bset.h
> >   drivers/md/bcache/btree.c
> >   drivers/md/bcache/writeback.c
> > 
> > between commit:
> > 
> >   3a861560ccb3 ("bcache: fix variable length array abuse in btree_iter")
> > 
> > from the block tree and commit:
> > 
> >   afa5721abaaa ("bcache: Remove heap-related macros and switch to generic min_heap")
> > 
> > from the refactor-heap tree.
> > 
> > Ok, these conflicts are too extensive, so I am dropping the refactor-heap
> > tree for today.  I suggest you all get together and sort something out.
> 
> I am still dropping the refactor-heap tree ...

Hi Kent,

Are you still planning to send the pull request in this merge window?
I've sent the v5 patch series [1] to resolve the conflicts some time ago.
Is there anything missing from my side?

[1]: https://lkml.kernel.org/20240514084724.557100-1-visitorckw@gmail.com

Regards,
Kuan-Wei