Nicholas Piggin 0c993300d5 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
2023-04-26 16:20:16 +10:00
..
2023-02-27 10:09:40 -08:00
2023-03-02 14:57:53 -08:00
2023-02-27 09:27:31 -08:00
2023-03-05 11:07:58 -08:00
2023-03-01 09:27:00 -08:00
2023-03-05 11:07:58 -08:00
2023-03-05 11:07:58 -08:00
2023-03-05 11:07:58 -08:00
2023-03-05 11:07:58 -08:00
2023-03-10 09:19:30 -08:00
2023-03-09 10:01:59 -08:00
2023-03-05 11:07:58 -08:00
2023-02-09 17:03:20 -08:00