# git rev-parse -q --verify c17414a273b81fe4e34e11d69fc30cc8b1431614^{commit} c17414a273b81fe4e34e11d69fc30cc8b1431614 already have revision, skipping fetch # git checkout -q -f -B kisskb c17414a273b81fe4e34e11d69fc30cc8b1431614 # git clean -qxdf # < git log -1 # commit c17414a273b81fe4e34e11d69fc30cc8b1431614 # Merge: 7afb9d76bc51 7497840d462c # Author: Linus Torvalds # Date: Wed Jul 5 21:45:32 2023 -0700 # # Merge tag 'sh-for-v6.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux # # Pull sh updates from Adrian Glaubitz: # "Fix a compiler warning in the J2 probing code and a fix by Sergey # Shtylyov to avoid using IRQ0 on SH3 and SH4 targets. Masahiro Yamada # made some clean-up in the build system to address reports by the 0day # bot. # # The most notable changes come from Artur Rojek who addressed a number # of issues in the DMA code, in particular a fix for the DMA channel # offset calculation that was introduced in in 7f47c7189b3e ("sh: dma: # More legacy cpu dma chainsawing.") in 2012! # # Together with another change to correct the number of DMA channels for # each SuperH SoC according to specification, Artur's series unbreaks # the kernel on the SH7709 SoC allowing Linux to boot on the HP Jornada # 680 handheld again. # # Summary: # # - Provide unxlate_dev_mem_ptr() in asm/io.h # # - dma: Correct the number of DMA channels for SH7709 # # - dma: Drop incorrect SH_DMAC_BASE1 definition for SH4 # # - dma: Fix DMA channel offset calculation # # - Remove compiler flag duplication # # - Refactor header include path addition # # - Move build rule for cchips/hd6446x/ to arch/sh/Kbuild # # - Fix -Wmissing-include-dirs warnings for various platforms # # - Avoid using IRQ0 on SH3 and SH4 # # - j2: Use ioremap() to translate device tree address into kernel # memory" # # * tag 'sh-for-v6.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux: # sh: Provide unxlate_dev_mem_ptr() in asm/io.h # sh: dma: Correct the number of DMA channels for SH7709 # sh: dma: Drop incorrect SH_DMAC_BASE1 definition for SH4 # sh: dma: Fix DMA channel offset calculation # sh: Remove compiler flag duplication # sh: Refactor header include path addition # sh: Move build rule for cchips/hd6446x/ to arch/sh/Kbuild # sh: Fix -Wmissing-include-dirs warnings for various platforms # sh: Avoid using IRQ0 on SH3 and SH4 # sh: j2: Use ioremap() to translate device tree address into kernel memory # < /opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 c17414a273b81fe4e34e11d69fc30cc8b1431614 # make -s -j 160 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig+NO_SPLPAR_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.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 160 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig+NO_SPLPAR_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 160 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig+NO_SPLPAR_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 160 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig+NO_SPLPAR_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- Completed OK # rm -rf /kisskb/build/linus_pseries_le_defconfig+NO_SPLPAR_powerpc-gcc12 # Build took: 0:04:06.812793