# git rev-parse -q --verify 6c0f91b64501b8ab9882d7162198bb1ec6ede135^{commit} 6c0f91b64501b8ab9882d7162198bb1ec6ede135 already have revision, skipping fetch # git checkout -q -f -B kisskb 6c0f91b64501b8ab9882d7162198bb1ec6ede135 # git clean -qxdf # < git log -1 # commit 6c0f91b64501b8ab9882d7162198bb1ec6ede135 # Merge: 12ffddc64447 3019af90b262 # Author: Michael Ellerman # Date: Fri Jun 9 23:36:48 2023 +1000 # # Automatic merge of 'next-test' into merge-test (2023-06-09 23:36) # < /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 6c0f91b64501b8ab9882d7162198bb1ec6ede135 # make -s -j 160 ARCH=powerpc O=/kisskb/build/powerpc-merge_pseries_defconfig_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- pseries_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) # # < make -s -j 160 ARCH=powerpc O=/kisskb/build/powerpc-merge_pseries_defconfig_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/powerpc-merge_pseries_defconfig_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/powerpc-merge_pseries_defconfig_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/arch/powerpc/kernel/ptrace/ptrace-view.c:3: /kisskb/src/arch/powerpc/kernel/ptrace/ptrace-view.c: In function 'dexcr_get': /kisskb/src/arch/powerpc/kernel/ptrace/ptrace-view.c:472:41: error: 'CONFIG_PPC_DEXCR_DEFAULT' undeclared (first use in this function); did you mean 'CONFIG_PCIEASPM_DEFAULT'? 472 | membuf_store(&to, (unsigned int)CONFIG_PPC_DEXCR_DEFAULT); | ^~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/regset.h:66:24: note: in definition of macro 'membuf_store' 66 | typeof(v) __v = (v); \ | ^ /kisskb/src/arch/powerpc/kernel/ptrace/ptrace-view.c:472:41: note: each undeclared identifier is reported only once for each function it appears in 472 | membuf_store(&to, (unsigned int)CONFIG_PPC_DEXCR_DEFAULT); | ^~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/regset.h:66:24: note: in definition of macro 'membuf_store' 66 | typeof(v) __v = (v); \ | ^ make[5]: *** [/kisskb/src/scripts/Makefile.build:252: arch/powerpc/kernel/ptrace/ptrace-view.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:494: arch/powerpc/kernel/ptrace] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:494: arch/powerpc/kernel] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:494: arch/powerpc] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:2026: .] Error 2 make: *** [Makefile:226: __sub-make] Error 2 Command 'make -s -j 160 ARCH=powerpc O=/kisskb/build/powerpc-merge_pseries_defconfig_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/powerpc-merge_pseries_defconfig_powerpc-gcc12 # Build took: 0:02:04.886603