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
Date: Wed, 1 Nov 2023 11:32:22 +1100 [thread overview]
Message-ID: <20231101113222.13e7edc2@canb.auug.org.au> (raw)
In-Reply-To: <20230914083145.17c2e7de@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1683 bytes --]
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.org> wrote:
> >
> > On Wed, 13 Sep 2023 09:10:11 +0800 Qi Zheng <zhengqi.arch@bytedance.com> wrote:
> >
> > > > From: Stephen Rothwell <sfr@canb.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@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(-)
> > >
> > > This version looks good to me.
> > >
> > > Reviewed-by: Qi Zheng <zhengqi.arch@bytedance.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).
This is now a conflict between the mm-stable tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-11-01 0:33 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-12 2:04 linux-next: build failure after merge of the bcachefs tree Stephen Rothwell
2023-09-12 2:47 ` Qi Zheng
2023-09-12 23:35 ` Stephen Rothwell
2023-09-13 1:10 ` Qi Zheng
2023-09-13 20:23 ` Andrew Morton
2023-09-13 22:31 ` Stephen Rothwell
2023-11-01 0:32 ` Stephen Rothwell [this message]
2023-11-01 0:53 ` Kent Overstreet
2023-11-01 1:14 ` Stephen Rothwell
2023-09-13 22:14 ` Stephen Rothwell
2023-11-12 22:30 Stephen Rothwell
2023-11-15 23:02 Stephen Rothwell
2024-02-07 0:57 Stephen Rothwell
2024-02-08 22:46 ` Stephen Rothwell
2024-02-08 23:59 ` Kent Overstreet
2024-02-11 23:54 Stephen Rothwell
2024-02-14 0:16 ` Kees Cook
2024-02-14 0:29 ` Kent Overstreet
2024-02-14 0:39 ` Darrick J. Wong
2024-02-14 1:09 ` Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231101113222.13e7edc2@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=kent.overstreet@gmail.com \
--cc=kent.overstreet@linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=zhengqi.arch@bytedance.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).