# git rev-parse -q --verify 975f3b6da18020f1c8a7667ccb08fa542928ec03^{commit} 975f3b6da18020f1c8a7667ccb08fa542928ec03 already have revision, skipping fetch # git checkout -q -f -B kisskb 975f3b6da18020f1c8a7667ccb08fa542928ec03 # git clean -qxdf # < git log -1 # commit 975f3b6da18020f1c8a7667ccb08fa542928ec03 # Merge: a52ff901a174 448494051429 # Author: Linus Torvalds # Date: Fri Jul 12 12:08:42 2024 -0700 # # Merge tag 'for-6.10-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux # # Pull btrfs fixes from David Sterba: # "Fix a regression in extent map shrinker behaviour. # # In the past weeks we got reports from users that there are huge # latency spikes or freezes. This was bisected to newly added shrinker # of extent maps (it was added to fix a build up of the structures in # memory). # # I'm assuming that the freezes would happen to many users after release # so I'd like to get it merged now so it's in 6.10. Although the diff # size is not small the changes are relatively straightforward, the # reporters verified the fixes and we did testing on our side. # # The fixes: # # - adjust behaviour under memory pressure and check lock or scheduling # conditions, bail out if needed # # - synchronize tracking of the scanning progress so inode ranges are # not skipped or work duplicated # # - do a delayed iput when scanning a root so evicting an inode does # not slow things down in case of lots of dirty data, also fix # lockdep warning, a deadlock could happen when writing the dirty # data would need to start a transaction" # # * tag 'for-6.10-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: # btrfs: avoid races when tracking progress for extent map shrinking # btrfs: stop extent map shrinker if reschedule is needed # btrfs: use delayed iput during extent map shrinking # < /opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 975f3b6da18020f1c8a7667ccb08fa542928ec03 # make -s -j 40 ARCH=um O=/kisskb/build/linus_defconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 defconfig # < make -s -j 40 ARCH=um O=/kisskb/build/linus_defconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 40 ARCH=um O=/kisskb/build/linus_defconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig # make -s -j 40 ARCH=um O=/kisskb/build/linus_defconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 LINK linux Completed OK # rm -rf /kisskb/build/linus_defconfig_um-x86_64-gcc12 # Build took: 0:00:35.245578