Re: linux-next: build failure after merge of the bcachefs tree

[Kent Overstreet]

On Wed, Nov 01, 2023 at 11:32:22AM +1100, Stephen Rothwell wrote:
> Hi Andrew,
> 
> On Thu, 14 Sep 2023 08:31:45 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > On Wed, 13 Sep 2023 13:23:30 -0700 Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote:
> > >
> > > On Wed, 13 Sep 2023 09:10:11 +0800 Qi Zheng <zhengqi.arch@xxxxxxxxxxxxx> wrote:
> > >   
> > > > > From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> > > > > Date: Tue, 12 Sep 2023 11:27:22 +1000
> > > > > Subject: [PATCH] bcachefs: convert to dynamically allocated shrinkers
> > > > > 
> > > > > Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> > > > > ---
> > > > >   fs/bcachefs/btree_cache.c     | 22 ++++++++++++----------
> > > > >   fs/bcachefs/btree_key_cache.c | 21 ++++++++++++---------
> > > > >   fs/bcachefs/btree_types.h     |  4 ++--
> > > > >   fs/bcachefs/fs.c              |  2 +-
> > > > >   fs/bcachefs/sysfs.c           |  2 +-
> > > > >   5 files changed, 28 insertions(+), 23 deletions(-)    
> > > > 
> > > > This version looks good to me.
> > > > 
> > > > Reviewed-by: Qi Zheng <zhengqi.arch@xxxxxxxxxxxxx>    
> > > 
> > > I not longer carry a post-linux-next patch queue, so there's nothing I
> > > can do with this patch.  I'll assume that either Kent or I will merge
> > > it later, depending upon whose stuff goes into mainline first.  
> > 
> > Actually the correct plan is for you and Kent to inform Linus of the
> > need for this patch as part of the merge resolution when he merges the
> > latter of your trees (unless you want to stabilise the shrinker changes
> > into a separate branch that is never rewritten and is merged into your
> > tree and the bcachefs tree).
> 
> This is now a conflict between the mm-stable tree and Linus' tree.

Is/was there a procedure for me here?