# 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-8.1.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 96485e4462604744d66bf4301557d996d80b85eb # < make -s -j 80 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # < make -s -j 80 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- help # make -s -j 80 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- olddefconfig .config:12701:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 80 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- In file included from /kisskb/src/include/linux/printk.h:7, from /kisskb/src/include/linux/kernel.h:16, from /kisskb/src/include/asm-generic/bug.h:20, from /kisskb/src/arch/mips/include/asm/bug.h:42, from /kisskb/src/include/linux/bug.h:5, from /kisskb/src/include/linux/thread_info.h:12, from /kisskb/src/include/asm-generic/current.h:5, from ./arch/mips/include/generated/asm/current.h:1, from /kisskb/src/include/linux/sched.h:12, from /kisskb/src/fs/btrfs/extent-tree.c:6: /kisskb/src/fs/btrfs/extent-tree.c: In function '__btrfs_free_extent': /kisskb/src/include/linux/kern_levels.h:5:18: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'unsigned int' [-Wformat=] #define KERN_SOH "\001" /* ASCII Start Of Header */ ^~~~~~ /kisskb/src/include/linux/kern_levels.h:10:19: note: in expansion of macro 'KERN_SOH' #define KERN_CRIT KERN_SOH "2" /* critical conditions */ ^~~~~~~~ /kisskb/src/fs/btrfs/ctree.h:3148:24: note: in expansion of macro 'KERN_CRIT' btrfs_printk(fs_info, KERN_CRIT fmt, ##args) ^~~~~~~~~ /kisskb/src/fs/btrfs/extent-tree.c:3187:4: note: in expansion of macro 'btrfs_crit' btrfs_crit(info, ^~~~~~~~~~ /kisskb/src/fs/btrfs/extent-tree.c:3188:83: note: format string is defined here "invalid extent item size for key (%llu, %u, %llu) owner %llu, has %u expect >= %lu", ~~^ %u /kisskb/src/drivers/misc/habanalabs/common/command_buffer.c: In function 'hl_cb_mmap': /kisskb/src/drivers/misc/habanalabs/common/command_buffer.c:512:44: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] rc = hdev->asic_funcs->cb_mmap(hdev, vma, (void *) cb->kernel_address, ^ /kisskb/src/drivers/input/joystick/analog.c:160:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^~~~~~~ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:28, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:261: warning: "M_SPC_CFG_CLEAR" redefined #define M_SPC_CFG_CLEAR M_BCM1480_SPC_CFG_CLEAR In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:27, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:392: note: this is the location of the previous definition #define M_SPC_CFG_CLEAR _SB_MAKEMASK1(32) In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:28, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:262: warning: "M_SPC_CFG_ENABLE" redefined #define M_SPC_CFG_ENABLE M_BCM1480_SPC_CFG_ENABLE In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:27, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:393: note: this is the location of the previous definition #define M_SPC_CFG_ENABLE _SB_MAKEMASK1(33) In file included from /kisskb/src/arch/mips/include/asm/page.h:258, from /kisskb/src/arch/mips/include/asm/io.h:29, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/arch/mips/include/asm/mips-cps.h:10, from /kisskb/src/arch/mips/include/asm/smp-ops.h:16, from /kisskb/src/arch/mips/include/asm/smp.h:21, from /kisskb/src/include/linux/smp.h:85, from /kisskb/src/include/linux/percpu.h:7, from /kisskb/src/include/linux/prandom.h:12, from /kisskb/src/include/linux/random.h:118, from /kisskb/src/include/linux/net.h:18, from /kisskb/src/drivers/infiniband/sw/siw/siw_qp_tx.c:8: /kisskb/src/drivers/infiniband/sw/siw/siw_qp_tx.c: In function 'siw_tx_hdt': /kisskb/src/arch/mips/include/asm/page.h:249:53: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define virt_to_pfn(kaddr) PFN_DOWN(virt_to_phys((void *)(kaddr))) ^ /kisskb/src/include/asm-generic/memory_model.h:33:41: note: in definition of macro '__pfn_to_page' #define __pfn_to_page(pfn) (mem_map + ((pfn) - ARCH_PFN_OFFSET)) ^~~ /kisskb/src/arch/mips/include/asm/page.h:249:31: note: in expansion of macro 'PFN_DOWN' #define virt_to_pfn(kaddr) PFN_DOWN(virt_to_phys((void *)(kaddr))) ^~~~~~~~ /kisskb/src/arch/mips/include/asm/page.h:250:41: note: in expansion of macro 'virt_to_pfn' #define virt_to_page(kaddr) pfn_to_page(virt_to_pfn(kaddr)) ^~~~~~~~~~~ /kisskb/src/drivers/infiniband/sw/siw/siw_qp_tx.c:528:23: note: in expansion of macro 'virt_to_page' page_array[seg] = virt_to_page(va & PAGE_MASK); ^~~~~~~~~~~~ FIT description: Linux 5.9.0+ Created: Fri Oct 23 07:16:49 2020 Image 0 (kernel@0) Description: Linux 5.9.0+ Created: Fri Oct 23 07:16:49 2020 Type: Kernel Image Compression: gzip compressed Data Size: 9545261 Bytes = 9321.54 KiB = 9.10 MiB Architecture: MIPS OS: Linux Load Address: 0x84000000 Entry Point: 0x85378500 Hash algo: sha1 Hash value: bf8457826112e792d3ff33e9013ef0b9169ee2e3 Image 1 (fdt@boston) Description: img,boston Device Tree Created: Fri Oct 23 07:16:49 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 3793 Bytes = 3.70 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 4799f50d688573234da6e9d7701234d394759ef4 Image 2 (fdt@ni169445) Description: NI 169445 device tree Created: Fri Oct 23 07:16:49 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 1871 Bytes = 1.83 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 51b89b31605ee62038c8468c429af091dfc75ec7 Image 3 (fdt@ocelot_pcb123) Description: MSCC Ocelot PCB123 Device Tree Created: Fri Oct 23 07:16:49 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 4659 Bytes = 4.55 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 5bcb6e4f21e8e5372544aa130b3bd097355a9050 Image 4 (fdt@ocelot_pcb120) Description: MSCC Ocelot PCB120 Device Tree Created: Fri Oct 23 07:16:49 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 5418 Bytes = 5.29 KiB = 0.01 MiB Architecture: MIPS Hash algo: sha1 Hash value: 93d882f2009a217e0fa9dab94788535ed2be8476 Image 5 (fdt@xilfpga) Description: MIPSfpga (xilfpga) Device Tree Created: Fri Oct 23 07:16:49 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 2708 Bytes = 2.64 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 63d058b780f65e22da30f0a183433765f1807f1d Default Configuration: 'conf@default' Configuration 0 (conf@default) Description: Generic Linux kernel Kernel: kernel@0 Configuration 1 (conf@boston) Description: Boston Linux kernel Kernel: kernel@0 FDT: fdt@boston Configuration 2 (conf@ni169445) Description: NI 169445 Linux Kernel Kernel: kernel@0 FDT: fdt@ni169445 Configuration 3 (conf@ocelot_pcb123) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb123 Configuration 4 (conf@ocelot_pcb120) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb120 Configuration 5 (conf@xilfpga) Description: MIPSfpga Linux kernel Kernel: kernel@0 FDT: fdt@xilfpga Completed OK # rm -rf /kisskb/build/linus_mips-allmodconfig_mips-gcc8 # Build took: 0:23:15.162435