# git rev-parse -q --verify 04b8076df2534f08bb4190f90a24e0f7f8930aca^{commit} 04b8076df2534f08bb4190f90a24e0f7f8930aca already have revision, skipping fetch # git checkout -q -f -B kisskb 04b8076df2534f08bb4190f90a24e0f7f8930aca # git clean -qxdf # < git log -1 # commit 04b8076df2534f08bb4190f90a24e0f7f8930aca # Merge: 4640e2be3920 d0b06dc48fb1 # Author: Linus Torvalds # Date: Sat Mar 2 15:18:02 2024 -0800 # # Merge tag 'firewire-fixes-6.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 # # Pull firewire fixes from Takashi Sakamoto: # "A workaround to suppress the continuous bus resets in the case that # older devices are connected to the modern 1394 OHCI hardware and # devices # # In IEEE 1394 Amendment (IEEE 1394a-2000), the short bus reset is added # to resolve the shortcomings of the long bus reset in IEEE 1394-1995. # However, it is well-known that the solution is not necessarily # effective in the mixing environment that both IEEE 1394-1995 PHY and # IEEE 1394a-2000 (or later) PHY exist, as described in section 8.4.6.2 # of IEEE 1394a-2000. # # The current implementation of firewire stack schedules the short bus # reset when attempting to resolve the mismatch of gap count in the # certain generation of bus topology. It can cause the continuous bus # reset in the issued environment. # # The workaround simply uses the long bus reset instead of the short bus # reset. It is desirable to detect whether the issued environment or # not. However, the way to access PHY registers from remote note is # firstly defined in IEEE 1394a-2000, thus it is not available in the # case" # # * tag 'firewire-fixes-6.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394: # firewire: core: use long bus reset on gap count error # < /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 04b8076df2534f08bb4190f90a24e0f7f8930aca # make -s -j 160 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 160 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 160 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 160 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:02:41.354094