Commit 0c99330
powerpc: Fix merge conflict between pcrel and copy_thread changes
Fix a conflict between commit 4e991e3 ("powerpc: add CFUNC
assembly label annotation") and commit b504b6a ("powerpc:
differentiate kthread from user kernel thread start").
Fixes: 4e991e3 ("powerpc: add CFUNC assembly label annotation")
Fixes: b504b6a ("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.com1 parent 836a3de commit 0c99330
1 file changed
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
756 | 756 | | |
757 | 757 | | |
758 | 758 | | |
759 | | - | |
| 759 | + | |
760 | 760 | | |
761 | 761 | | |
762 | 762 | | |
| |||
0 commit comments