# git rev-parse -q --verify 96485e4462604744d66bf4301557d996d80b85eb^{commit} 96485e4462604744d66bf4301557d996d80b85eb already have revision, skipping fetch # git checkout -q -f -B kisskb 96485e4462604744d66bf4301557d996d80b85eb # git clean -qxdf # < git log -1 # commit 96485e4462604744d66bf4301557d996d80b85eb # Merge: f56e65dff6ad 1322181170bb # Author: Linus Torvalds # Date: Thu Oct 22 10:31:08 2020 -0700 # # Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 # # Pull ext4 updates from Ted Ts'o: # "The siginificant new ext4 feature this time around is Harshad's new # fast_commit mode. # # In addition, thanks to Mauricio for fixing a race where mmap'ed pages # that are being changed in parallel with a data=journal transaction # commit could result in bad checksums in the failure that could cause # journal replays to fail. # # Also notable is Ritesh's buffered write optimization which can result # in significant improvements on parallel write workloads. (The kernel # test robot reported a 330.6% improvement on fio.write_iops on a 96 # core system using DAX) # # Besides that, we have the usual miscellaneous cleanups and bug fixes" # # Link: https://lore.kernel.org/r/20200925071217.GO28663@shao2-debian # # * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (46 commits) # ext4: fix invalid inode checksum # ext4: add fast commit stats in procfs # ext4: add a mount opt to forcefully turn fast commits on # ext4: fast commit recovery path # jbd2: fast commit recovery path # ext4: main fast-commit commit path # jbd2: add fast commit machinery # ext4 / jbd2: add fast commit initialization # ext4: add fast_commit feature and handling for extended mount options # doc: update ext4 and journalling docs to include fast commit feature # ext4: Detect already used quota file early # jbd2: avoid transaction reuse after reformatting # ext4: use the normal helper to get the actual inode # ext4: fix bs < ps issue reported with dioread_nolock mount opt # ext4: data=journal: write-protect pages on j_submit_inode_data_buffers() # ext4: data=journal: fixes for ext4_page_mkwrite() # jbd2, ext4, ocfs2: introduce/use journal callbacks j_submit|finish_inode_data_buffers() # jbd2: introduce/export functions jbd2_journal_submit|finish_inode_data_buffers() # ext4: introduce ext4_sb_bread_unmovable() to replace sb_bread_unmovable() # ext4: use ext4_sb_bread() instead of sb_bread() # ... # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 96485e4462604744d66bf4301557d996d80b85eb # < make -s -j 24 ARCH=sh O=/kisskb/build/linus_sh7785lcr_32bit_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- sh7785lcr_32bit_defconfig # < make -s -j 24 ARCH=sh O=/kisskb/build/linus_sh7785lcr_32bit_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 24 ARCH=sh O=/kisskb/build/linus_sh7785lcr_32bit_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 24 ARCH=sh O=/kisskb/build/linus_sh7785lcr_32bit_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration make[2]: *** [/kisskb/src/scripts/Makefile.build:283: scripts/mod/empty.o] Error 1 make[2]: *** Waiting for unfinished jobs.... sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration make[2]: *** [/kisskb/src/scripts/Makefile.build:117: scripts/mod/devicetable-offsets.s] Error 1 make[1]: *** [/kisskb/src/Makefile:1190: prepare0] Error 2 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 24 ARCH=sh O=/kisskb/build/linus_sh7785lcr_32bit_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_sh7785lcr_32bit_defconfig_sh4-gcc4.9 # Build took: 0:00:04.586186