linux-kernel - Re: linux-next: build failure after merge of the bcachefs 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: <20230914083145.17c2e7de@canb.auug.org.au>
Date:   Thu, 14 Sep 2023 08:31:45 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>
Cc:     Qi Zheng <zhengqi.arch@...edance.com>,
        Kent Overstreet <kent.overstreet@...ux.dev>,
        Kent Overstreet <kent.overstreet@...il.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the bcachefs tree

Hi Andrew,

On Wed, 13 Sep 2023 13:23:30 -0700 Andrew Morton <akpm@...ux-foundation.org> wrote:
>
> On Wed, 13 Sep 2023 09:10:11 +0800 Qi Zheng <zhengqi.arch@...edance.com> wrote:
> 
> > > From: Stephen Rothwell <sfr@...b.auug.org.au>
> > > Date: Tue, 12 Sep 2023 11:27:22 +1000
> > > Subject: [PATCH] bcachefs: convert to dynamically allocated shrinkers
> > > 
> > > Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
> > > ---
> > >   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@...edance.com>  
> 
> 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).

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped