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

Merge tag 'platform-drivers-x86-v6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

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

clocksource/drivers/timer-ti-dm: Move struct omap_dm_timer fields to driver

2022-09-20 10:49:46 +02:00

crypto

crypto: scatterwalk - Remove unused inline function scatterwalk_aligned()

2022-09-30 13:59:13 +08:00

drm

Merge tag 'driver-core-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2022-10-07 17:04:10 -07:00

dt-bindings

Merge tag 'pinctrl-v6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

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

powerpc/math-emu: Remove -w build flag and fix warnings

2022-09-05 17:28:25 +10:00

media

Merge tag 'usb-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

2022-10-07 16:48:26 -07:00

memory

…

misc

…

net

Merge tag 'random-6.1-rc1-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random

2022-10-16 15:27:07 -07:00

pcmcia

…

ras

mm, hwpoison: enable memory error handling on 1GB hugepage

2022-08-08 18:06:44 -07:00

rdma

RDMA/core: Add UVERBS_ATTR_RAW_FD

2022-09-27 10:15:24 -03:00

rv

Documentation/rv: Add deterministic automata monitor synthesis documentation

2022-07-30 14:01:29 -04:00

scsi

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2022-10-07 12:33:18 -07:00

soc

Merge tag 'riscv-for-linus-6.1-mw2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux

2022-10-14 11:21:11 -07:00

sound

ALSA: hda: Update register polling macros

2022-10-09 12:34:32 +02:00

target

scsi: target: core: De-RCU of se_lun and se_lun acl

2022-08-01 19:36:02 -04:00

trace

Merge tag 'f2fs-for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs

2022-10-10 20:28:41 -07:00

uapi

Merge tag 'for-linus-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs

2022-10-14 18:23:23 -07:00

ufs

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

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