Ingo Molnar 0ce096db71 Linux 6.1-rc6 ... -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmN6wAgeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiG0EYH/3/RO90NbrFItraN Lzr+d3VdbGjTu8xd1M+PRTmwh3zxLpB+Jwqr0T0A2gzL9B/D+AUPUJdrCVbv9DqS FLJAVqoeV20dNBAHSffOOLPsgCZ+Eu+LzlNN7Iqde0e8cyZICFMNktitui84Xm/i 1NgFVgz9OZ6+aieYvUj3FrFq0p8GTIaC/oybDZrxYKcO8ZzKVMJ11swRw10wwq0g qOOECvV3w7wlQ8upQZkzFxItKFc7EexZI6R4elXeGSJJ9Hlc092dv/zsKB9dwV+k WcwkJrZRoezYXzgGBFxUcQtzi+ethjrPjuJuM1rYLUSIcfIW/0lkaSLgRoBu8D+I 1GfXkXs= =gt6P -----END PGP SIGNATURE----- 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 <mingo@kernel.org>		2022-11-21 23:01:51 +01:00
..
cpu.c	x86/cpu: Restore AMD's DE_CFG MSR after resume	2022-11-15 10:15:58 -08:00
hibernate_32.c	mm: reorder includes after introduction of linux/pgtable.h	2020-06-09 09:39:13 -07:00
hibernate_64.c	mm: reorder includes after introduction of linux/pgtable.h	2020-06-09 09:39:13 -07:00
hibernate_asm_32.S	x86: Prepare asm files for straight-line-speculation	2021-12-08 12:25:37 +01:00
hibernate_asm_64.S	x86: Prepare asm files for straight-line-speculation	2021-12-08 12:25:37 +01:00
hibernate.c	x86,pm: Force out-of-line memcpy()	2022-11-05 11:28:02 +01:00
Makefile	clang-lto for v5.12-rc1 (part2)	2021-02-23 15:13:45 -08:00