# 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/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 78c3925c048c752334873f56c3a3d1c9d53e0416 # make -s -j 32 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig+NO_SPLPAR_powerpc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- pseries_le_defconfig Using /kisskb/src/arch/powerpc/configs/ppc64_defconfig as base Merging /kisskb/src/arch/powerpc/configs/le.config Merging /kisskb/src/arch/powerpc/configs/guest.config Value of CONFIG_VIRTIO_BLK is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_BLK=m New value: CONFIG_VIRTIO_BLK=y Value of CONFIG_SCSI_VIRTIO is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_SCSI_VIRTIO=m New value: CONFIG_SCSI_VIRTIO=y Value of CONFIG_VIRTIO_NET is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_NET=m New value: CONFIG_VIRTIO_NET=y Value of CONFIG_VIRTIO_CONSOLE is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_CONSOLE=m New value: CONFIG_VIRTIO_CONSOLE=y Value of CONFIG_VIRTIO_PCI is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_PCI=m New value: CONFIG_VIRTIO_PCI=y Value of CONFIG_VIRTIO_BALLOON is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_BALLOON=m New value: CONFIG_VIRTIO_BALLOON=y Value of CONFIG_VHOST_NET is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VHOST_NET=m New value: CONFIG_VHOST_NET=y Value of CONFIG_IBMVETH is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_IBMVETH=m New value: CONFIG_IBMVETH=y Value of CONFIG_IBMVNIC is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_IBMVNIC=m New value: CONFIG_IBMVNIC=y Merging /kisskb/src/arch/powerpc/configs/kvm_guest.config # # merged configuration written to .config (needs make) # # Added to kconfig CONFIG_PPC_SPLPAR=n # < make -s -j 32 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig+NO_SPLPAR_powerpc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 32 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig+NO_SPLPAR_powerpc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 32 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig+NO_SPLPAR_powerpc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- Completed OK # rm -rf /kisskb/build/linus_pseries_le_defconfig+NO_SPLPAR_powerpc-gcc13 # Build took: 0:03:57.762052