projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 21d6a7d 2c41fab)
Merge branch 'linus' into x86/cleanups, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Sun, 21 Mar 2021 21:16:08 +0000 (22:16 +0100)
committerIngo Molnar <mingo@kernel.org>
Sun, 21 Mar 2021 21:16:08 +0000 (22:16 +0100)
commitca8778c45e401067cefe2abbfb8b547c30d45908
treec10beaf40adb2bbc6a8933f87ff9da7a5366bf42tree | snapshot
parent21d6a7dcbfba5e7b31f4e9d555a9be362578bfc3commit | diff
parent2c41fab1c60b02626c8153a1806a7a1e5d62aaf1commit | diff
Merge branch 'linus' into x86/cleanups, to resolve conflict

Conflicts:
arch/x86/kernel/kprobes/ftrace.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/events/intel/core.c diff1 | diff2 | blob | history
arch/x86/events/intel/ds.c diff1 | diff2 | blob | history
arch/x86/include/asm/kvm_host.h diff1 | diff2 | blob | history
arch/x86/include/asm/processor.h diff1 | diff2 | blob | history
arch/x86/kernel/apic/apic.c diff1 | diff2 | blob | history
arch/x86/kernel/apic/io_apic.c diff1 | diff2 | blob | history
arch/x86/kernel/signal.c diff1 | diff2 | blob | history
arch/x86/kvm/mmu/mmu_internal.h diff1 | diff2 | blob | history
arch/x86/kvm/mmu/tdp_mmu.c diff1 | diff2 | blob | history
arch/x86/kvm/x86.c diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git