# git rev-parse -q --verify 78c3925c048c752334873f56c3a3d1c9d53e0416^{commit} 78c3925c048c752334873f56c3a3d1c9d53e0416 already have revision, skipping fetch # git checkout -q -f -B kisskb 78c3925c048c752334873f56c3a3d1c9d53e0416 # git clean -qxdf # < git log -1 # commit 78c3925c048c752334873f56c3a3d1c9d53e0416 # Merge: f9c035492f20 72ebb41b88f9 # Author: Linus Torvalds # Date: Tue Mar 19 11:57:26 2024 -0700 # # Merge tag 'soc-late-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc # # Pull more ARM SoC updates from Arnd Bergmann: # "These are changes that for some reason ended up not making it into the # first four branches but that should still make it into 6.9: # # - A rework of the omap clock support that touches both drivers and # device tree files # # - The reset controller branch changes that had a dependency on late # bugfixes. Merging them here avoids a backmerge of 6.8-rc5 into the # drivers branch # # - The RISC-V/starfive, RISC-V/microchip and ARM/Broadcom devicetree # changes that got delayed and needed some extra time in linux-next # for wider testing" # # * tag 'soc-late-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (31 commits) # soc: fsl: dpio: fix kcalloc() argument order # bus: ts-nbus: Improve error reporting # bus: ts-nbus: Convert to atomic pwm API # riscv: dts: starfive: jh7110: Add camera subsystem nodes # ARM: bcm: stop selecing CONFIG_TICK_ONESHOT # ARM: dts: omap3: Update clksel clocks to use reg instead of ti,bit-shift # ARM: dts: am3: Update clksel clocks to use reg instead of ti,bit-shift # clk: ti: Improve clksel clock bit parsing for reg property # clk: ti: Handle possible address in the node name # dt-bindings: pwm: opencores: Add compatible for StarFive JH8100 # dt-bindings: riscv: cpus: reg matches hart ID # reset: Instantiate reset GPIO controller for shared reset-gpios # reset: gpio: Add GPIO-based reset controller # cpufreq: do not open-code of_phandle_args_equal() # of: Add of_phandle_args_equal() helper # reset: simple: add support for Sophgo SG2042 # dt-bindings: reset: sophgo: support SG2042 # riscv: dts: microchip: add specific compatible for mpfs pdma # riscv: dts: microchip: add missing CAN bus clocks # ARM: brcmstb: Add debug UART entry for 74165 # ... # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 78c3925c048c752334873f56c3a3d1c9d53e0416 # make -s -j 32 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.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 # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig # < make -s -j 32 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/mips-linux/bin/mips-linux- help # make -s -j 32 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/mips-linux/bin/mips-linux- olddefconfig .config:14993:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 32 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/mips-linux/bin/mips-linux- /kisskb/src/arch/mips/boot/dts/img/boston.dts:128.17-178.5: Warning (interrupt_provider): /pci@14000000/pci2_root@0,0: '#interrupt-cells' found, but node is not an interrupt provider /kisskb/src/arch/mips/boot/dts/img/boston.dts:136.23-177.6: Warning (interrupt_provider): /pci@14000000/pci2_root@0,0/eg20t_bridge@1,0,0: '#interrupt-cells' found, but node is not an interrupt provider arch/mips/boot/dts/img/boston.dtb: Warning (interrupt_map): Failed prerequisite 'interrupt_provider' /kisskb/src/drivers/gpu/drm/xe/xe_lrc.c:100: error: "END" redefined [-Werror] 100 | #define END 0 | In file included from /kisskb/src/arch/mips/include/asm/bitops.h:19, from /kisskb/src/include/linux/bitops.h:68, from /kisskb/src/include/linux/thread_info.h:27, from /kisskb/src/include/asm-generic/preempt.h:5, from ./arch/mips/include/generated/asm/preempt.h:1, from /kisskb/src/include/linux/preempt.h:79, from /kisskb/src/include/linux/spinlock.h:56, from /kisskb/src/include/linux/wait.h:9, from /kisskb/src/include/linux/dma-fence.h:17, from /kisskb/src/drivers/gpu/drm/xe/xe_hw_fence_types.h:9, from /kisskb/src/drivers/gpu/drm/xe/xe_lrc_types.h:9, from /kisskb/src/drivers/gpu/drm/xe/xe_lrc.h:8, from /kisskb/src/drivers/gpu/drm/xe/xe_lrc.c:6: /kisskb/src/arch/mips/include/asm/asm.h:69: note: this is the location of the previous definition 69 | #define END(function) \ | cc1: all warnings being treated as errors make[7]: *** [/kisskb/src/scripts/Makefile.build:243: drivers/gpu/drm/xe/xe_lrc.o] Error 1 make[7]: *** Waiting for unfinished jobs.... make[6]: *** [/kisskb/src/scripts/Makefile.build:481: drivers/gpu/drm/xe] Error 2 make[6]: *** Waiting for unfinished jobs.... make[5]: *** [/kisskb/src/scripts/Makefile.build:481: drivers/gpu/drm] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:481: drivers/gpu] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:481: drivers] Error 2 make[2]: *** [/kisskb/src/Makefile:1912: .] Error 2 make[1]: *** [/kisskb/src/Makefile:240: __sub-make] Error 2 make: *** [Makefile:240: __sub-make] Error 2 Command 'make -s -j 32 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/mips-linux/bin/mips-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_mips-gcc13 # Build took: 0:20:12.568485