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

[Kent Overstreet]

On Tue, May 21, 2024 at 10:44:11AM +0800, Kuan-Wei Chiu wrote:
> 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@xxxxxxxxxxxxxxxx> 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?

Unfortunately it's going to have to wait until next merge window, all
the conferences the past week have meant I've been pretty distracted,
still not fully caught back up.