Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Date:   Wed, 1 Nov 2023 11:32:22 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     Qi Zheng <zhengqi.arch@bytedance.com>,
        Kent Overstreet <kent.overstreet@linux.dev>,
        Kent Overstreet <kent.overstreet@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the bcachefs tree
Message-ID: <20231101113222.13e7edc2@canb.auug.org.au>
In-Reply-To: <20230914083145.17c2e7de@canb.auug.org.au>
References: <20230912120429.7852428f@canb.auug.org.au>
        <e639a428-0fb7-7329-ce52-e51f7951a146@bytedance.com>
        <20230913093553.4290421e@canb.auug.org.au>
        <ada473e9-aa2f-c6ff-b869-cf94942ddd20@bytedance.com>
        <20230913132330.00b3ef07f696cf9efc4d0886@linux-foundation.org>
        <20230914083145.17c2e7de@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/1.0EBoCEorT8Ulh4SIWeziu";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/1.0EBoCEorT8Ulh4SIWeziu
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Andrew,

On Thu, 14 Sep 2023 08:31:45 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> On Wed, 13 Sep 2023 13:23:30 -0700 Andrew Morton <akpm@linux-foundation.o=
rg> wrote:
> >
> > On Wed, 13 Sep 2023 09:10:11 +0800 Qi Zheng <zhengqi.arch@bytedance.com=
> wrote:
> >  =20
> > > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > > Date: Tue, 12 Sep 2023 11:27:22 +1000
> > > > Subject: [PATCH] bcachefs: convert to dynamically allocated shrinke=
rs
> > > >=20
> > > > Signed-off-by: Stephen Rothwell <sfr@canb.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(-)   =20
> > >=20
> > > This version looks good to me.
> > >=20
> > > Reviewed-by: Qi Zheng <zhengqi.arch@bytedance.com>   =20
> >=20
> > 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. =20
>=20
> 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.

--=20
Cheers,
Stephen Rothwell

--Sig_/1.0EBoCEorT8Ulh4SIWeziu
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVBnJYACgkQAVBC80lX
0GwJpwf/csecxXPPdT/XePMK3t2Pqr81wdy9BzK7Au3Jrw/J3qL6MJbaXxf4ME7G
y8Tmfmcf6TLK2LWhvnV1T0lLlWC8UMJbCxvXp/AWj7mVLyeeyhNfecPGJXIjB7xF
z9mmocX83gy0GLcdB4XG3vZqCY++4wr2OJONrPd041nvENinqjsiHTMdh7JOdv7E
MwFi6Acf8bczrsDVKBkUfVIn5wP3Xd7UgMiHXlvtknTie5q9lCfyM8LuhpfGLoXb
UqiTxE2x2jQiM8fVkM8//5/qA+fKAGk+Pe5mN4FuHzqjkUJeoMIGYjp1yoWYgQCL
eT7j66WMcujmEWqXVBkKHhEcpczLCA==
=dLTC
-----END PGP SIGNATURE-----

--Sig_/1.0EBoCEorT8Ulh4SIWeziu--