# git rev-parse -q --verify 24ed334f33666f2ae929ccc08f72e7e72e353c64^{commit} 24ed334f33666f2ae929ccc08f72e7e72e353c64 already have revision, skipping fetch # git checkout -q -f -B kisskb 24ed334f33666f2ae929ccc08f72e7e72e353c64 # git clean -qxdf # < git log -1 # commit 24ed334f33666f2ae929ccc08f72e7e72e353c64 # Merge: e80bc229691a 85a585918fb4 # Author: Linus Torvalds # Date: Thu Oct 25 13:32:00 2018 -0700 # # Merge branch 'next-loadpin' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security # # Pull LoadPin updates from James Morris: # "From Kees: This is a small reporting improvement and the param change # needed for the ordering series (but since the loadpin change is # desired and separable, I'm putting it here)" # # * 'next-loadpin' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: # LoadPin: Rename boot param "enabled" to "enforce" # LoadPin: Report friendly block device name # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < git log --format=%s --max-count=1 24ed334f33666f2ae929ccc08f72e7e72e353c64 # < make -s -j 10 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 # yes \n | make -s -j 10 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- oldconfig yes: standard output: Broken pipe # make -s -j 10 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/drivers/infiniband/hw/bnxt_re/main.c:66: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/arch/mips/include/asm/page.h:199, from /kisskb/src/include/linux/mmzone.h:21, from /kisskb/src/include/linux/gfp.h:6, from /kisskb/src/include/linux/umh.h:4, from /kisskb/src/include/linux/kmod.h:22, from /kisskb/src/include/linux/module.h:13, from /kisskb/src/drivers/infiniband/hw/bnxt_re/main.c:39: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq /kisskb/src/drivers/input/joystick/analog.c:172: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/drivers/net/ethernet/broadcom/bnxt/bnxt.c:58: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/arch/mips/include/asm/page.h:199, from /kisskb/src/include/linux/mmzone.h:21, from /kisskb/src/include/linux/gfp.h:6, from /kisskb/src/include/linux/umh.h:4, from /kisskb/src/include/linux/kmod.h:22, from /kisskb/src/include/linux/module.h:13, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.c:11: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c:18: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/arch/mips/include/asm/page.h:199, from /kisskb/src/include/linux/mmzone.h:21, from /kisskb/src/include/linux/gfp.h:6, from /kisskb/src/include/linux/umh.h:4, from /kisskb/src/include/linux/kmod.h:22, from /kisskb/src/include/linux/module.h:13, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c:11: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c:22: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/io.h:25, from /kisskb/src/arch/mips/include/asm/mips-cps.h:14, 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:68, from /kisskb/src/arch/mips/include/asm/cpu-type.h:12, from /kisskb/src/arch/mips/include/asm/timex.h:19, from /kisskb/src/include/linux/timex.h:65, from /kisskb/src/include/linux/jiffies.h:10, from /kisskb/src/include/linux/ktime.h:25, from /kisskb/src/include/linux/timer.h:6, from /kisskb/src/include/linux/workqueue.h:9, from /kisskb/src/include/linux/rhashtable-types.h:15, from /kisskb/src/include/linux/ipc.h:7, from /kisskb/src/include/uapi/linux/sem.h:5, from /kisskb/src/include/linux/sem.h:5, from /kisskb/src/include/linux/compat.h:14, from /kisskb/src/include/linux/ethtool.h:17, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c:13: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c:20: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/io.h:25, from /kisskb/src/arch/mips/include/asm/mips-cps.h:14, 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:68, from /kisskb/src/arch/mips/include/asm/cpu-type.h:12, from /kisskb/src/arch/mips/include/asm/timex.h:19, from /kisskb/src/include/linux/timex.h:65, from /kisskb/src/include/linux/jiffies.h:10, from /kisskb/src/include/linux/ktime.h:25, from /kisskb/src/include/linux/timer.h:6, from /kisskb/src/include/linux/netdevice.h:28, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c:11: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c:24: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/arch/mips/include/asm/page.h:199, from /kisskb/src/include/linux/mmzone.h:21, from /kisskb/src/include/linux/gfp.h:6, from /kisskb/src/include/linux/umh.h:4, from /kisskb/src/include/linux/kmod.h:22, from /kisskb/src/include/linux/module.h:13, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c:10: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c:19: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/arch/mips/include/asm/page.h:199, from /kisskb/src/include/linux/mmzone.h:21, from /kisskb/src/include/linux/gfp.h:6, from /kisskb/src/include/linux/idr.h:16, from /kisskb/src/include/linux/kernfs.h:14, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/pci.h:29, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c:11: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c:17: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/arch/mips/include/asm/page.h:199, from /kisskb/src/include/linux/mmzone.h:21, from /kisskb/src/include/linux/gfp.h:6, from /kisskb/src/include/linux/idr.h:16, from /kisskb/src/include/linux/kernfs.h:14, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/pci.h:29, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c:9: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c:12: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/arch/mips/include/asm/page.h:199, from /kisskb/src/include/linux/mmzone.h:21, from /kisskb/src/include/linux/gfp.h:6, from /kisskb/src/include/linux/umh.h:4, from /kisskb/src/include/linux/kmod.h:22, from /kisskb/src/include/linux/module.h:13, from /kisskb/src/include/linux/net_dim.h:37, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c:10: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c:13: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/arch/mips/include/asm/page.h:199, from /kisskb/src/include/linux/mmzone.h:21, from /kisskb/src/include/linux/gfp.h:6, from /kisskb/src/include/linux/idr.h:16, from /kisskb/src/include/linux/kernfs.h:14, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/pci.h:29, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c:10: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c:15: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/arch/mips/include/asm/page.h:199, from /kisskb/src/include/linux/mm_types_task.h:16, from /kisskb/src/include/linux/mm_types.h:5, from /kisskb/src/include/linux/fs.h:23, from /kisskb/src/include/linux/debugfs.h:15, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c:10: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c:22: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/io.h:25, from /kisskb/src/arch/mips/include/asm/mips-cps.h:14, 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:68, from /kisskb/src/arch/mips/include/asm/cpu-type.h:12, from /kisskb/src/arch/mips/include/asm/timex.h:19, from /kisskb/src/include/linux/timex.h:65, from /kisskb/src/include/linux/jiffies.h:10, from /kisskb/src/include/linux/ktime.h:25, from /kisskb/src/include/linux/timer.h:6, from /kisskb/src/include/linux/netdevice.h:28, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c:10: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq /kisskb/src/drivers/spi/spi-sh-msiof.c:74: warning: "STR" redefined #define STR 0x40 /* Status Register */ In file included from /kisskb/src/arch/mips/include/asm/mach-generic/spaces.h:15, 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:236, from /kisskb/src/arch/mips/include/asm/bitops.h:16, from /kisskb/src/include/linux/bitops.h:19, from /kisskb/src/include/linux/bitmap.h:8, from /kisskb/src/drivers/spi/spi-sh-msiof.c:10: /kisskb/src/arch/mips/include/asm/mipsregs.h:30: note: this is the location of the previous definition #define STR(x) __STR(x) /kisskb/src/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c: In function 'mlx5e_grp_sw_update_stats': /kisskb/src/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c:216:1: warning: the frame size of 1240 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:41, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:274: 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, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:405: 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, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:275: 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, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:406: note: this is the location of the previous definition #define M_SPC_CFG_ENABLE _SB_MAKEMASK1(33) /kisskb/src/scripts/unifdef.c: In function 'Mpass': /kisskb/src/scripts/unifdef.c:453:28: warning: 'strncpy' output truncated before terminating nul copying 4 bytes from a string of the same length [-Wstringop-truncation] static void Mpass (void) { strncpy(keyword, "if ", 4); Pelif(); } ^~~~~~~~~~~~~~~~~~~~~~~~~~~ FIT description: Linux 4.19.0+ Created: Fri Oct 26 14:00:06 2018 Image 0 (kernel@0) Description: Linux 4.19.0+ Created: Fri Oct 26 14:00:06 2018 Type: Kernel Image Compression: gzip compressed Data Size: 6081835 Bytes = 5939.29 KiB = 5.80 MiB Architecture: MIPS OS: Linux Load Address: 0x84000000 Entry Point: 0x849774b0 Hash algo: sha1 Hash value: 6410e2c0c0f19c2b9dd79f524a0440ce6c8ed2a4 Image 1 (fdt@boston) Description: img,boston Device Tree Created: Fri Oct 26 14:00:06 2018 Type: Flat Device Tree Compression: uncompressed Data Size: 3668 Bytes = 3.58 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 569c37cc891ce1e1f3a193cb41cc691a5d2debb5 Image 2 (fdt@ni169445) Description: NI 169445 device tree Created: Fri Oct 26 14:00:06 2018 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 26 14:00:06 2018 Type: Flat Device Tree Compression: uncompressed Data Size: 4254 Bytes = 4.15 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 2c2b332bb1535ea0bf84590d586354b02dc1bf8f Image 4 (fdt@xilfpga) Description: MIPSfpga (xilfpga) Device Tree Created: Fri Oct 26 14:00:06 2018 Type: Flat Device Tree Compression: uncompressed Data Size: 2708 Bytes = 2.64 KiB = 0.00 MiB 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_mips-gcc8 # Build took: 0:35:59.612772