git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

author	Ingo Molnar <mingo@kernel.org>
	Wed, 14 Feb 2024 09:45:07 +0000 (10:45 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Wed, 14 Feb 2024 09:45:07 +0000 (10:45 +0100)
commit	03c11eb3b16dc0058589751dfd91f254be2be613
tree	e5f2889212fec0bb0babdce9abd781ab487e246a	tree
parent	de8c6a352131f642b82474abe0cbb5dd26a7e081	commit \| diff
parent	841c35169323cd833294798e58b9bf63fa4fa1de	commit \| diff

Merge tag 'v6.8-rc4' into x86/percpu, to resolve conflicts and refresh the branch

Conflicts:
arch/x86/include/asm/percpu.h
arch/x86/include/asm/text-patching.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

20 files changed:

arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/entry/calling.h	diff1 \|	diff2 \|	blob \| history
arch/x86/entry/entry_32.S	diff1 \|	diff2 \|	blob \| history
arch/x86/entry/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/current.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/nospec-branch.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/percpu.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/preempt.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/text-patching.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/alternative.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/callthunks.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/head_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vmlinux.lds.S	diff1 \|	diff2 \|	blob \| history
arch/x86/lib/cmpxchg8b_emu.S	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/xen-asm.S	diff1 \|	diff2 \|	blob \| history
include/linux/compiler.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/entry/calling.h	diff1 \|	diff2 \|	blob \| history
arch/x86/entry/entry_32.S	diff1 \|	diff2 \|	blob \| history
arch/x86/entry/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/current.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/nospec-branch.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/percpu.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/preempt.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/text-patching.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/alternative.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/callthunks.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/head_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vmlinux.lds.S	diff1 \|	diff2 \|	blob \| history
arch/x86/lib/cmpxchg8b_emu.S	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/xen-asm.S	diff1 \|	diff2 \|	blob \| history
include/linux/compiler.h	diff1 \|	diff2 \|	blob \| history