From: Qu Wenruo <wqu@suse•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>, David Sterba <dsterba@suse•cz>
Cc: David Sterba <dsterba@suse•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the btrfs tree with the btrfs-fixes tree
Date: Fri, 7 Jun 2024 08:42:03 +0930 [thread overview]
Message-ID: <8697c785-8724-448d-8cba-65e81a9c4d6a@suse.com> (raw)
In-Reply-To: <20240607085525.30555161@canb.auug.org.au>
在 2024/6/7 08:25, Stephen Rothwell 写道:
> Hi all,
>
> Today's linux-next merge of the btrfs tree got a conflict in:
>
> fs/btrfs/extent_io.c
>
> between commit:
>
> d202776a44d5 ("btrfs: protect folio::private when attaching extent buffer folios")
>
> from the btrfs-fixes tree and commit:
>
> 46cda5a0ef68 ("btrfs: fix a possible race window when allocating new extent buffers")
>
> from the btrfs tree.
>
> I fixed it up (I just used the latter) and can carry the fix as
> necessary.
Please use the one titled "btrfs: protect folio::private when attaching
extent buffer folios" instead.
The one titled "btrfs: fix a possible race window when allocating new
extent buffers" has a bug that would lead to a crash when a race happens.
> 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.
>
The "fix a possible race" one is originally a RFC without proper root
cause pinned down, nor enough determining tests.
Considering it's an urgent bug we're pushing that RFC fix for testing.
But now we have pinned down the root cause and have done enough tests,
the older RFC one can be gone.
Sorry for the inconvenience.
Thanks,
Qu
next prev parent reply other threads:[~2024-06-06 23:12 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-06 22:55 linux-next: manual merge of the btrfs tree with the btrfs-fixes tree Stephen Rothwell
2024-06-06 23:12 ` Qu Wenruo [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-06-02 12:41 Mark Brown
2026-03-24 13:25 Mark Brown
2026-03-24 13:25 Mark Brown
2026-03-17 13:48 Mark Brown
2026-03-17 13:48 Mark Brown
2026-03-17 13:48 Mark Brown
2025-09-18 11:26 Mark Brown
2023-10-04 23:09 Stephen Rothwell
2022-10-31 23:28 Stephen Rothwell
2022-09-05 23:50 Stephen Rothwell
2022-09-06 0:15 ` Stephen Rothwell
2022-09-06 19:41 ` David Sterba
2022-03-24 23:48 Stephen Rothwell
2022-02-24 13:44 broonie
2022-02-25 11:59 ` David Sterba
2021-01-10 22:29 Stephen Rothwell
2020-05-01 0:28 Stephen Rothwell
2020-05-03 21:40 ` David Sterba
2020-05-01 0:24 Stephen Rothwell
2020-05-01 1:05 ` Stephen Rothwell
2020-05-01 2:06 ` Qu Wenruo
2020-01-08 22:14 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=8697c785-8724-448d-8cba-65e81a9c4d6a@suse.com \
--to=wqu@suse$(echo .)com \
--cc=dsterba@suse$(echo .)com \
--cc=dsterba@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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