# git rev-parse -q --verify e6e6ec48dd0fa12e8a2d1ff6b55cd907401bd7fe^{commit} e6e6ec48dd0fa12e8a2d1ff6b55cd907401bd7fe already have revision, skipping fetch # git checkout -q -f -B kisskb e6e6ec48dd0fa12e8a2d1ff6b55cd907401bd7fe # git clean -qxdf # < git log -1 # commit e6e6ec48dd0fa12e8a2d1ff6b55cd907401bd7fe # Merge: addcb1d0ee31 2b4eae95c736 # Author: Linus Torvalds # Date: Wed Mar 11 13:35:34 2020 -0700 # # Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt # # Pull fscrypt fix from Eric Biggers: # "Fix a bug where if userspace is writing to encrypted files while the # FS_IOC_REMOVE_ENCRYPTION_KEY ioctl (introduced in v5.4) is running, # dirty inodes could be evicted, causing writes could be lost or the # filesystem to hang due to a use-after-free. This was encountered # during real-world use, not just theoretical. # # Tested with the existing fscrypt xfstests, and with a new xfstest I # wrote to reproduce this bug. This fix does expose an existing bug with # '-o lazytime' that Ted is working on fixing, but this fix is more # critical and needed anyway regardless of the lazytime fix" # # * tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt: # fscrypt: don't evict dirty inodes after removing key # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ld --version # < git log --format=%s --max-count=1 e6e6ec48dd0fa12e8a2d1ff6b55cd907401bd7fe # < make -s -j 32 ARCH=arm O=/kisskb/build/linus_u300_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- u300_defconfig # < make -s -j 32 ARCH=arm O=/kisskb/build/linus_u300_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- help # make -s -j 32 ARCH=arm O=/kisskb/build/linus_u300_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- olddefconfig # make -s -j 32 ARCH=arm O=/kisskb/build/linus_u300_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- Completed OK # rm -rf /kisskb/build/linus_u300_defconfig_arm-gcc4.9 # Build took: 0:00:40.099019