summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/Kconfig
diff options
context:
space:
mode:
authorNicholas Piggin <npiggin@gmail.com>2023-04-26 07:58:38 +0200
committerMichael Ellerman <mpe@ellerman.id.au>2023-04-26 08:20:16 +0200
commit0c993300d52bf5ce9b951c3b6b25d0d14acc49a9 (patch)
tree1b89c34a0cb83642b63ac7a005a36184927674f7 /arch/powerpc/Kconfig
parentpowerpc/configs/powernv: Add IGB=y (diff)
downloadlinux-0c993300d52bf5ce9b951c3b6b25d0d14acc49a9.tar.xz
linux-0c993300d52bf5ce9b951c3b6b25d0d14acc49a9.zip
powerpc: Fix merge conflict between pcrel and copy_thread changes
Fix a conflict between commit 4e991e3c16a35 ("powerpc: add CFUNC assembly label annotation") and commit b504b6aade040 ("powerpc: differentiate kthread from user kernel thread start"). Fixes: 4e991e3c16a35 ("powerpc: add CFUNC assembly label annotation") Fixes: b504b6aade040 ("powerpc: differentiate kthread from user kernel thread start") Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://msgid.link/20230426055848.402993-2-npiggin@gmail.com
Diffstat (limited to 'arch/powerpc/Kconfig')
0 files changed, 0 insertions, 0 deletions