# git rev-parse -q --verify 10f3e23f07cb0c20f9bcb77a5b5a7eb2a1b2a2fe^{commit} 10f3e23f07cb0c20f9bcb77a5b5a7eb2a1b2a2fe already have revision, skipping fetch # git checkout -q -f -B kisskb 10f3e23f07cb0c20f9bcb77a5b5a7eb2a1b2a2fe # git clean -qxdf # < git log -1 # commit 10f3e23f07cb0c20f9bcb77a5b5a7eb2a1b2a2fe # Merge: 3bb37da 863c37f # Author: Linus Torvalds # Date: Mon Aug 13 22:34:47 2018 -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: # # - Convert content from the ext4 wiki to Documentation rst files so it # is more likely to be updated as we add new features to ext4. # # - Add 64-bit timestamp support to ext4's superblock fields. # # - ... and the usual bug fixes and cleanups, including a Spectre gadget # fixup and some hardening against maliciously corrupted file systems. # # * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (34 commits) # ext4: remove unneeded variable "err" in ext4_mb_release_inode_pa() # ext4: improve code readability in ext4_iget() # ext4: fix spectre gadget in ext4_mb_regular_allocator() # ext4: check for NUL characters in extended attribute's name # ext4: use ext4_warning() for sb_getblk failure # ext4: fix race when setting the bitmap corrupted flag # ext4: reset error code in ext4_find_entry in fallback # ext4: handle layout changes to pinned DAX mappings # dax: dax_layout_busy_page() warn on !exceptional # docs: fix up the obviously obsolete bits in the new ext4 documentation # docs: add new ext4 superblock time extension fields # docs: create filesystem internal section # ext4: use swap macro in mext_page_double_lock # ext4: check allocation failure when duplicating "data" in ext4_remount() # ext4: fix warning message in ext4_enable_quotas() # ext4: super: extend timestamps to 40 bits # jbd2: replace current_kernel_time64 with ktime equivalent # ext4: use timespec64 for all inode times # ext4: use ktime_get_real_seconds for i_dtime # ext4: use 64-bit timestamps for mmp_time # ... # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-gcc --version # < git log --format=%s --max-count=1 10f3e23f07cb0c20f9bcb77a5b5a7eb2a1b2a2fe # < make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-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 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- olddefconfig # make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- /kisskb/src/drivers/input/joystick/analog.c:176:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^ /kisskb/src/drivers/spi/spi-sh-msiof.c:77:0: warning: "STR" redefined #define STR 0x40 /* Status Register */ ^ In file included from /kisskb/src/arch/mips/include/asm/mach-generic/spaces.h:15:0, from /kisskb/src/arch/mips/include/asm/addrspace.h:13, from /kisskb/src/arch/mips/include/asm/barrier.h:11, from /kisskb/src/include/linux/compiler.h:245, from /kisskb/src/arch/mips/include/asm/bitops.h:16, from /kisskb/src/include/linux/bitops.h:18, from /kisskb/src/include/linux/bitmap.h:8, from /kisskb/src/drivers/spi/spi-sh-msiof.c:14: /kisskb/src/arch/mips/include/asm/mipsregs.h:30:0: note: this is the location of the previous definition #define STR(x) __STR(x) ^ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:41:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:274:0: 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:40:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:405:0: 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:41:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:275:0: 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:40:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:406:0: note: this is the location of the previous definition #define M_SPC_CFG_ENABLE _SB_MAKEMASK1(33) ^ FIT description: Linux 4.18.0+ Created: Tue Aug 14 18:46:20 2018 Image 0 (kernel@0) Description: Linux 4.18.0+ Created: Tue Aug 14 18:46:20 2018 Type: Kernel Image Compression: gzip compressed Data Size: 5763733 Bytes = 5628.65 kB = 5.50 MB Architecture: MIPS OS: Linux Load Address: 0x84000000 Entry Point: 0x848f1940 Hash algo: sha1 Hash value: 8aa946d4d0a51bd10a7545613a98fff1e0a2856c Image 1 (fdt@boston) Description: img,boston Device Tree Created: Tue Aug 14 18:46:20 2018 Type: Flat Device Tree Compression: uncompressed Data Size: 3668 Bytes = 3.58 kB = 0.00 MB Architecture: MIPS Hash algo: sha1 Hash value: 569c37cc891ce1e1f3a193cb41cc691a5d2debb5 Image 2 (fdt@ni169445) Description: NI 169445 device tree Created: Tue Aug 14 18:46:20 2018 Type: Flat Device Tree Compression: uncompressed Data Size: 1871 Bytes = 1.83 kB = 0.00 MB Architecture: MIPS Hash algo: sha1 Hash value: 51b89b31605ee62038c8468c429af091dfc75ec7 Image 3 (fdt@ocelot_pcb123) Description: MSCC Ocelot PCB123 Device Tree Created: Tue Aug 14 18:46:20 2018 Type: Flat Device Tree Compression: uncompressed Data Size: 4099 Bytes = 4.00 kB = 0.00 MB Architecture: MIPS Hash algo: sha1 Hash value: d6b84965b858109511872b01415e613e125e44b1 Image 4 (fdt@xilfpga) Description: MIPSfpga (xilfpga) Device Tree Created: Tue Aug 14 18:46:20 2018 Type: Flat Device Tree Compression: uncompressed Data Size: 2708 Bytes = 2.64 kB = 0.00 MB Architecture: MIPS Hash algo: sha1 Hash value: 509ce58e44c561d54539e64e9d4b47054e696fc6 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@xilfpga) Description: MIPSfpga Linux kernel Kernel: kernel@0 FDT: fdt@xilfpga Completed OK # rm -rf /kisskb/build/linus_mips-allmodconfig_mipsel # Build took: 0:17:43.120685