Re: linux-next: manual merge of the refactor-heap tree with the block tree

[Kent Overstreet]

On Thu, May 09, 2024 at 03:27:45PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> 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.

Coli and Kuan, you guys will need to get this sorted out quick if we
want refactor-heap to make the merge window