Subject: Re: linux-next: manual merge of the btrfs tree with the btrfs-fixes tree

From: Qu Wenruo <[email-masked]>
Date: Fri, 7 Jun 2024 08:42:03 +0930

在 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