Files
Linux/scripts
Ingo Molnar 0ce096db71 Merge tag 'v6.1-rc6' into x86/core, to resolve conflicts
Resolve conflicts between these commits in arch/x86/kernel/asm-offsets.c:

 # upstream:
 debc5a1ec0 ("KVM: x86: use a separate asm-offsets.c file")

 # retbleed work in x86/core:
 5d8213864a ("x86/retbleed: Add SKL return thunk")

... and these commits in include/linux/bpf.h:

  # upstram:
  18acb7fac2 ("bpf: Revert ("Fix dispatcher patchable function entry to 5 bytes nop")")

  # x86/core commits:
  931ab63664 ("x86/ibt: Implement FineIBT")
  bea75b3389 ("x86/Kconfig: Introduce function padding")

The latter two modify BPF_DISPATCHER_ATTRIBUTES(), which was removed upstream.

 Conflicts:
	arch/x86/kernel/asm-offsets.c
	include/linux/bpf.h

Signed-off-by: Ingo Molnar <[email protected]>
2022-11-21 23:01:51 +01:00
..
2022-08-07 21:30:36 +02:00
…
2022-09-28 09:02:20 +02:00
…
2022-09-28 09:02:20 +02:00
…
2022-09-28 09:02:20 +02:00
2022-03-21 08:13:03 -07:00
2022-09-28 09:02:20 +02:00
2022-09-28 09:02:20 +02:00
2022-10-03 14:03:19 -07:00
2022-11-01 13:44:10 +01:00
2022-10-28 00:19:40 +09:00
…
2022-09-26 10:13:13 -07:00
2022-03-07 13:54:59 +01:00
2020-12-08 23:30:04 +09:00
2020-12-08 23:30:04 +09:00
…
2021-05-03 17:23:06 -06:00