# git rev-parse -q --verify ff2632d7d08edc11e8bd0629e9fcfebab25c78b4^{commit} ff2632d7d08edc11e8bd0629e9fcfebab25c78b4 already have revision, skipping fetch # git checkout -q -f -B kisskb ff2632d7d08edc11e8bd0629e9fcfebab25c78b4 # git clean -qxdf # < git log -1 # commit ff2632d7d08edc11e8bd0629e9fcfebab25c78b4 # Merge: 4853f1f6ace3 61700f816e6f # Author: Linus Torvalds # Date: Fri May 17 09:05:46 2024 -0700 # # Merge tag 'powerpc-6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux # # Pull powerpc updates from Michael Ellerman: # # - Enable BPF Kernel Functions (kfuncs) in the powerpc BPF JIT. # # - Allow per-process DEXCR (Dynamic Execution Control Register) settings # via prctl, notably NPHIE which controls hashst/hashchk for ROP # protection. # # - Install powerpc selftests in sub-directories. Note this changes the # way run_kselftest.sh needs to be invoked for powerpc selftests. # # - Change fadump (Firmware Assisted Dump) to better handle memory # add/remove. # # - Add support for passing additional parameters to the fadump kernel. # # - Add support for updating the kdump image on CPU/memory add/remove # events. # # - Other small features, cleanups and fixes. # # Thanks to Andrew Donnellan, Andy Shevchenko, Aneesh Kumar K.V, Arnd # Bergmann, Benjamin Gray, Bjorn Helgaas, Christian Zigotzky, Christophe # Jaillet, Christophe Leroy, Colin Ian King, Cédric Le Goater, Dr. David # Alan Gilbert, Erhard Furtner, Frank Li, GUO Zihua, Ganesh Goudar, Geoff # Levand, Ghanshyam Agrawal, Greg Kurz, Hari Bathini, Joel Stanley, Justin # Stitt, Kunwu Chan, Li Yang, Lidong Zhong, Madhavan Srinivasan, Mahesh # Salgaonkar, Masahiro Yamada, Matthias Schiffer, Naresh Kamboju, Nathan # Chancellor, Nathan Lynch, Naveen N Rao, Nicholas Miehlbradt, Ran Wang, # Randy Dunlap, Ritesh Harjani, Sachin Sant, Shirisha Ganta, Shrikanth # Hegde, Sourabh Jain, Stephen Rothwell, sundar, Thorsten Blum, Vaibhav # Jain, Xiaowei Bao, Yang Li, and Zhao Chenhui. # # * tag 'powerpc-6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (85 commits) # powerpc/fadump: Fix section mismatch warning # powerpc/85xx: fix compile error without CONFIG_CRASH_DUMP # powerpc/fadump: update documentation about bootargs_append # powerpc/fadump: pass additional parameters when fadump is active # powerpc/fadump: setup additional parameters for dump capture kernel # powerpc/pseries/fadump: add support for multiple boot memory regions # selftests/powerpc/dexcr: Fix spelling mistake "predicition" -> "prediction" # KVM: PPC: Book3S HV nestedv2: Fix an error handling path in gs_msg_ops_kvmhv_nestedv2_config_fill_info() # KVM: PPC: Fix documentation for ppc mmu caps # KVM: PPC: code cleanup for kvmppc_book3s_irqprio_deliver # KVM: PPC: Book3S HV nestedv2: Cancel pending DEC exception # powerpc/xmon: Check cpu id in commands "c#", "dp#" and "dx#" # powerpc/code-patching: Use dedicated memory routines for patching # powerpc/code-patching: Test patch_instructions() during boot # powerpc64/kasan: Pass virtual addresses to kasan_init_phys_region() # powerpc: rename SPRN_HID2 define to SPRN_HID2_750FX # powerpc: Fix typos # powerpc/eeh: Fix spelling of the word "auxillary" and update comment # macintosh/ams: Fix unused variable warning # powerpc/Makefile: Remove bits related to the previous use of -mcmodel=large # ... # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 ff2632d7d08edc11e8bd0629e9fcfebab25c78b4 # make -s -j 160 ARCH=powerpc O=/kisskb/build/powerpc-fixes_pseries_defconfig+POWERNV=n_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.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) # # Added to kconfig CONFIG_PPC_POWERNV=n # < make -s -j 160 ARCH=powerpc O=/kisskb/build/powerpc-fixes_pseries_defconfig+POWERNV=n_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 160 ARCH=powerpc O=/kisskb/build/powerpc-fixes_pseries_defconfig+POWERNV=n_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 160 ARCH=powerpc O=/kisskb/build/powerpc-fixes_pseries_defconfig+POWERNV=n_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- gcc: error: /kisskb/build/powerpc-fixes_pseries_defconfig+POWERNV=n_powerpc-gcc5/tools/objtool/libsubcmd/libsubcmd.a: No such file or directory make[4]: *** [Makefile:75: /kisskb/build/powerpc-fixes_pseries_defconfig+POWERNV=n_powerpc-gcc5/tools/objtool/objtool] Error 1 make[3]: *** [Makefile:72: objtool] Error 2 make[2]: *** [/kisskb/src/Makefile:1358: tools/objtool] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:240: __sub-make] Error 2 make: *** [Makefile:240: __sub-make] Error 2 Command 'make -s -j 160 ARCH=powerpc O=/kisskb/build/powerpc-fixes_pseries_defconfig+POWERNV=n_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/powerpc-fixes_pseries_defconfig+POWERNV=n_powerpc-gcc5 # Build took: 0:00:13.395783