On Tue, Jun 22, 2021 at 01:25:50PM +0200, David Sterba wrote: > On Tue, Jun 22, 2021 at 01:16:04PM +0200, David Sterba wrote: > > On Tue, Jun 01, 2021 at 03:45:08PM -0400, Josef Bacik wrote: > > As this is going to be resent, I'll remove it from misc-next for now. > > Updated version can go in as a fix after rc1. > > Ok so that does not work, the patchset "[PATCH 0/4][v2] btrfs: commit > the transaction unconditionally for ensopc" > https://lore.kernel.org/linux-btrfs/cover.1623421213.git.josef@xxxxxxxxxxxxxx/ > touches the defines and can't be trivially resolved. Nikolay was kind to resolve the conflict so the final status is that "btrfs: handle shrink_delalloc pages calculation differently" has been removed from misc-next (due to known performance drop) and the refreshed patchset is now in misc-next.
