Received-SPF: pass (google.com: domain of linux-kernel+bounces-184387-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Tue, 21 May 2024 10:44:11 +0800
From: Kuan-Wei Chiu <visitorckw@gmail.com>
To: Kent Overstreet <kent.overstreet@linux.dev>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, Jens Axboe <axboe@kernel.dk>,
	Coly Li <colyli@suse.de>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Matthew Mirvish <matthew@mm12.xyz>,
	Bagas Sanjaya <bagasdotme@gmail.com>
Subject: Re: linux-next: manual merge of the refactor-heap tree with the
 block tree
Message-ID: <ZkwKe15cyhgRP4Qy@visitorckw-System-Product-Name>
References: <20240509152745.08af752f@canb.auug.org.au>
 <20240521121803.399705b0@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240521121803.399705b0@canb.auug.org.au>

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@canb.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