diff options
| author | Nicholas Piggin <[email protected]> | 2023-04-26 05:58:38 +0000 |
|---|---|---|
| committer | Michael Ellerman <[email protected]> | 2023-04-26 06:20:16 +0000 |
| commit | 0c993300d52bf5ce9b951c3b6b25d0d14acc49a9 (patch) | |
| tree | 1b89c34a0cb83642b63ac7a005a36184927674f7 /tools/perf/scripts/python | |
| parent | powerpc/configs/powernv: Add IGB=y (diff) | |
| download | kernel-0c993300d52bf5ce9b951c3b6b25d0d14acc49a9.tar.gz kernel-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 <[email protected]>
Signed-off-by: Michael Ellerman <[email protected]>
Link: https://msgid.link/[email protected]
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions