Searched hist:"0 c993300d52bf5ce9b951c3b6b25d0d14acc49a9" (Results 1 – 1 of 1) sorted by relevance
| /openbmc/linux/arch/powerpc/kernel/ |
| H A D | interrupt_64.S | diff 0c993300d52bf5ce9b951c3b6b25d0d14acc49a9 Wed Apr 26 00:58:38 CDT 2023 Nicholas Piggin <npiggin@gmail.com> 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
|