Ingo Molnar bd19461144 Merge branch 'x86/urgent' into x86/core, to resolve conflict ... There's a conflict between the call-depth tracking commits in x86/core: ee3e2469b3 ("x86/ftrace: Make it call depth tracking aware") 36b64f1012 ("x86/ftrace: Rebalance RSB") eac828eaef ("x86/ftrace: Remove ftrace_epilogue()") And these fixes in x86/urgent: 883bbbffa5 ("ftrace,kcfi: Separate ftrace_stub() and ftrace_stub_graph()") b5f1fc3184 ("x86/ftrace: Remove ftrace_epilogue()") It's non-trivial overlapping modifications - resolve them. Conflicts: arch/x86/kernel/ftrace_64.S Signed-off-by: Ingo Molnar <mingo@kernel.org>		2022-10-22 10:06:18 +02:00
..
acpi	platform-drivers-x86 for v6.1-1	2022-10-05 10:38:24 -07:00
asm-generic	Merge branch 'x86/urgent' into x86/core, to resolve conflict	2022-10-22 10:06:18 +02:00
clocksource
crypto
drm	Driver core changes for 6.1-rc1	2022-10-07 17:04:10 -07:00
dt-bindings	These are the pin control changes for the v6.1 kernel cycle:	2022-10-11 10:59:59 -07:00
keys
kunit	kunit: declare kunit_assert structs as const	2022-10-07 10:19:18 -06:00
kvm
linux	static_call: Add call depth tracking support	2022-10-17 16:41:16 +02:00
math-emu
media	USB/Thunderbolt changes for 6.1-rc1	2022-10-07 16:48:26 -07:00
memory
misc
net	Random number generator fixes for Linux 6.1-rc1.	2022-10-16 15:27:07 -07:00
pcmcia
ras
rdma
rv
scsi	SCSI misc on 20221007	2022-10-07 12:33:18 -07:00
soc	RISC-V Patches for the 6.1 Merge Window, Part 2	2022-10-14 11:21:11 -07:00
sound	ALSA: hda: Update register polling macros	2022-10-09 12:34:32 +02:00
target
trace	f2fs-for-6.1-rc1	2022-10-10 20:28:41 -07:00
uapi	This pull request contains updates for UBI and UBIFS	2022-10-14 18:23:23 -07:00
ufs	SCSI misc on 20221007	2022-10-07 12:33:18 -07:00
vdso
video
xen	xen/virtio: enable grant based virtio on x86	2022-10-10 14:31:26 +02:00