From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Christian Brauner <brauner@kernel.org>, Jan Kara <jack@suse.cz>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Qi Zheng <zhengqi.arch@bytedance.com>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the mm tree
Date: Tue, 31 Oct 2023 09:30:24 +1100 [thread overview]
Message-ID: <20231031093024.41459c83@canb.auug.org.au> (raw)
In-Reply-To: <20230928102504.5c751249@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1478 bytes --]
Hi all,
On Thu, 28 Sep 2023 10:25:04 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
>
> fs/xfs/xfs_buf.c
>
> between commit:
>
> 5c7b459f9f1d ("xfs: dynamically allocate the xfs-buf shrinker")
>
> from the mm tree and commit:
>
> 176ccb99e207 ("xfs: Convert to bdev_open_by_path()")
>
> from the vfs-brauner tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc fs/xfs/xfs_buf.c
> index 9e7ba04572db,003e157241da..000000000000
> --- a/fs/xfs/xfs_buf.c
> +++ b/fs/xfs/xfs_buf.c
> @@@ -1943,9 -1945,7 +1943,7 @@@ voi
> xfs_free_buftarg(
> struct xfs_buftarg *btp)
> {
> - struct block_device *bdev = btp->bt_bdev;
> -
> - unregister_shrinker(&btp->bt_shrinker);
> + shrinker_free(btp->bt_shrinker);
> ASSERT(percpu_counter_sum(&btp->bt_io_count) == 0);
> percpu_counter_destroy(&btp->bt_io_count);
> list_lru_destroy(&btp->bt_lru);
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-10-30 22:30 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-28 0:25 linux-next: manual merge of the vfs-brauner tree with the mm tree Stephen Rothwell
2023-10-30 22:30 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-02-20 23:32 Stephen Rothwell
2024-03-11 21:56 ` Stephen Rothwell
2023-11-21 23:31 Stephen Rothwell
2024-01-08 21:00 ` Stephen Rothwell
2023-09-20 23:13 Stephen Rothwell
2023-07-14 0:24 Stephen Rothwell
2023-07-14 0:02 Stephen Rothwell
2023-05-24 0:06 Stephen Rothwell
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=20231031093024.41459c83@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=brauner@kernel.org \
--cc=jack@suse.cz \
--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).