# git rev-parse -q --verify 7f50d4dfe816dd916a7cbf39039674825c2b388b^{commit} 7f50d4dfe816dd916a7cbf39039674825c2b388b already have revision, skipping fetch # git checkout -q -f -B kisskb 7f50d4dfe816dd916a7cbf39039674825c2b388b # git clean -qxdf # < git log -1 # commit 7f50d4dfe816dd916a7cbf39039674825c2b388b # Merge: ba62a537b48d 83da38d82b2f # Author: Linus Torvalds # Date: Thu May 26 17:27:49 2022 -0700 # # Merge tag 'for-linus' of https://github.com/openrisc/linux # # Pull OpenRISC updates from Stafford Horne: # # - A few sparse warning fixups and other cleanups I noticed when working # on a recent TLB bug found on a new OpenRISC core bring up. # # - A few fixup's from me and Jason A Donenfeld to help shutdown OpenRISC # platforms when running CI tests # # * tag 'for-linus' of https://github.com/openrisc/linux: # openrisc: Allow power off handler overriding # openrisc: Remove unused IMMU tlb workardound # openrisc/fault: Fix symbol scope warnings # openrisc/delay: Add include to fix symbol not declared warning # openrisc/time: Fix symbol scope warnings # openrisc/traps: Declare unhandled_exception for asmlinkage # openrisc/traps: Remove die_if_kernel function # openrisc/traps: Declare file scope symbols as static # openrisc: Update litex defconfig to support glibc userland # openrisc: Pretty print show_registers memory dumps # openrisc: Add syscall details to emergency syscall debugging # openrisc: Add support for liteuart emergency printing # openrisc: Cleanup emergency print handling # openrisc: Add gcc machine instruction flag configuration # openrisc: define nop command for simulator reboot # openrisc: remove bogus nops and shutdowns # openrisc: fix typos in comments # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 7f50d4dfe816dd916a7cbf39039674825c2b388b # < make -s -j 40 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.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 40 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/mips-linux/bin/mips-linux- help # make -s -j 40 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/mips-linux/bin/mips-linux- olddefconfig .config:13836:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 40 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/mips-linux/bin/mips-linux- /kisskb/src/arch/mips/boot/dts/img/boston.dts:128.19-178.5: Warning (pci_device_reg): /pci@14000000/pci2_root@0,0,0: PCI unit address format error, expected "0,0" /kisskb/src/drivers/net/wireless/intel/iwlwifi/pcie/trans.c:1093: error: "CAUSE" redefined [-Werror] 1093 | #define CAUSE(reg, mask) \ | In file included from /kisskb/src/arch/mips/include/asm/ptrace.h:19, from /kisskb/src/include/linux/sched/signal.h:14, from /kisskb/src/include/linux/rcuwait.h:6, from /kisskb/src/include/linux/percpu-rwsem.h:7, from /kisskb/src/include/linux/fs.h:33, from /kisskb/src/arch/mips/include/asm/elf.h:12, from /kisskb/src/include/linux/elf.h:6, from /kisskb/src/include/linux/module.h:19, from /kisskb/src/include/linux/device/driver.h:21, from /kisskb/src/include/linux/device.h:32, from /kisskb/src/include/linux/pci.h:37, from /kisskb/src/drivers/net/wireless/intel/iwlwifi/pcie/trans.c:7: /kisskb/src/arch/mips/include/uapi/asm/ptrace.h:18: note: this is the location of the previous definition 18 | #define CAUSE 65 | cc1: all warnings being treated as errors make[6]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/net/wireless/intel/iwlwifi/pcie/trans.o] Error 1 make[5]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/net/wireless/intel/iwlwifi] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/net/wireless/intel] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/net/wireless] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/net] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1839: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 40 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/mips-linux/bin/mips-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mips-allmodconfig_mips-gcc11 # Build took: 0:10:32.518675