# git rev-parse -q --verify b2e82e495a528eed77c15f3923c2b049a21d7280^{commit} b2e82e495a528eed77c15f3923c2b049a21d7280 already have revision, skipping fetch # git checkout -q -f -B kisskb b2e82e495a528eed77c15f3923c2b049a21d7280 # git clean -qxdf # < git log -1 # commit b2e82e495a528eed77c15f3923c2b049a21d7280 # Author: Nicholas Piggin # Date: Tue Oct 4 23:29:52 2022 +1000 # # powerpc/64s/interrupt: Fix stack frame regs marker # # The value of the stack frame regs marker that gets saved on the stack in # interrupt entry code does not match the regs marker value, which breaks # stack frame marker matching. # # This stray instruction looks to have been introduced in a mismerge. # # Fixes: bf75a3258a403 ("powerpc/64s/interrupt: move early boot ILE fixup into a macro") # Signed-off-by: Nicholas Piggin # [mpe: Mismerge by yours truly -_-] # Signed-off-by: Michael Ellerman # Link: https://lore.kernel.org/r/20221004132952.984341-1-npiggin@gmail.com # < /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 b2e82e495a528eed77c15f3923c2b049a21d7280 # < make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-next_powernv_defconfig+STRICT_RWX_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- powernv_defconfig # Added to kconfig CONFIG_RELOCATABLE=n # Added to kconfig CONFIG_STRICT_KERNEL_RWX=y # < make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-next_powernv_defconfig+STRICT_RWX_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-next_powernv_defconfig+STRICT_RWX_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig .config:4170:warning: override: reassigning to symbol RELOCATABLE # make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-next_powernv_defconfig+STRICT_RWX_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- Completed OK # rm -rf /kisskb/build/powerpc-next_powernv_defconfig+STRICT_RWX_powerpc-gcc5 # Build took: 0:02:09.890265