iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/arch/powerpc
History
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
..
boot
powerpc: drop PowerQUICC II Family ADS platform support
2023-04-20 13:21:48 +10:00
configs
powerpc/configs/powernv: Add IGB=y
2023-04-21 16:16:26 +10:00
crypto
crypto: powerpc - Use address generation helper for asm
2023-02-10 22:17:36 +11:00
include
powerpc/pseries: Always inline functions called from cpuidle
2023-04-20 13:21:49 +10:00
kernel
powerpc: Fix merge conflict between pcrel and copy_thread changes
2023-04-26 16:20:16 +10:00
kexec
powerpc/kexec_file: print error string on usable memory property update failure
2023-02-15 23:14:06 +11:00
kvm
powerpc: add CFUNC assembly label annotation
2023-04-20 12:54:24 +10:00
lib
powerpc/64: vmlinux support building with PCREL addresing
2023-04-20 12:59:21 +10:00
math-emu
powerpc/math-emu: Inhibit W=1 warnings
2022-09-08 11:11:18 +10:00
mm
powerpc: Use of_address_to_resource()
2023-04-04 22:11:03 +10:00
net
powerpc/64: vmlinux support building with PCREL addresing
2023-04-20 12:59:21 +10:00
perf
powerpc/perf: Properly detect mpc7450 family
2023-03-30 23:35:43 +11:00
platforms
powerpc: drop MPC8272-ADS and PowerQUICC II FADS shared code.
2023-04-20 13:21:48 +10:00
purgatory
powerpc/kcsan: Add exclusions from instrumentation
2023-02-10 22:19:56 +11:00
sysdev
powerpc: Use of_address_to_resource()
2023-04-04 22:11:03 +10:00
tools
powerpc/64: Add UADDR64 relocation support
2022-03-09 21:47:53 +11:00
xmon
powerpc/64: vmlinux support building with PCREL addresing
2023-04-20 12:59:21 +10:00
Kbuild
kbuild: use more subdir- for visiting subdirectories while cleaning
2021-10-24 13:49:46 +09:00
Kconfig
powerpc/configs/64s: Select ARCH_WANT_DEFAULT_BPF_JIT
2023-04-21 16:16:22 +10:00
Kconfig.debug
powerpc: Add support for early debugging via Serial 16550 console
2022-09-28 19:22:09 +10:00
Makefile
powerpc/configs: Make pseries_defconfig an alias for ppc64le_guest
2023-04-21 16:16:25 +10:00
Makefile.postlink
kbuild: remove --include-dir MAKEFLAG from top Makefile
2023-02-05 18:51:22 +09:00