Merge branch 'kvm/kvm-sls-fix'

Sync with the last minute SLS fix to extend it for IBT. Signed-off-by: Peter Zijlstra <peterz@infradead.org>
2026-11-10 20:48:12 +00:00 · 2022-03-21 10:57:51 +01:00 · 2022-03-21 10:57:51 +01:00 · b9067cd80f
commit b9067cd80f
parent f6a2c2b2de fe83f5eae4
55 changed files with 231 additions and 224 deletions
--- a/2
+++ b/2
--- a/arch/arm64/include/asm/vectors.h
+++ b/arch/arm64/include/asm/vectors.h
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
--- a/block/blk-core.c
+++ b/block/blk-core.c
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
--- a/drivers/crypto/qcom-rng.c
+++ b/drivers/crypto/qcom-rng.c
--- a/drivers/firmware/efi/apple-properties.c
+++ b/drivers/firmware/efi/apple-properties.c
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
--- a/drivers/gpu/drm/bridge/Kconfig
+++ b/drivers/gpu/drm/bridge/Kconfig
--- a/drivers/gpu/drm/imx/parallel-display.c
+++ b/drivers/gpu/drm/imx/parallel-display.c
--- a/drivers/gpu/drm/mgag200/mgag200_pll.c
+++ b/drivers/gpu/drm/mgag200/mgag200_pll.c
--- a/drivers/gpu/drm/panel/Kconfig
+++ b/drivers/gpu/drm/panel/Kconfig
--- a/drivers/gpu/drm/panel/panel-simple.c
+++ b/drivers/gpu/drm/panel/panel-simple.c
--- a/drivers/net/dsa/microchip/ksz8795_spi.c
+++ b/drivers/net/dsa/microchip/ksz8795_spi.c
--- a/drivers/net/dsa/microchip/ksz9477_spi.c
+++ b/drivers/net/dsa/microchip/ksz9477_spi.c
--- a/drivers/net/ethernet/atheros/alx/main.c
+++ b/drivers/net/ethernet/atheros/alx/main.c
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
--- a/drivers/net/ethernet/intel/iavf/iavf_main.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
--- a/drivers/net/ethernet/mscc/ocelot_flower.c
+++ b/drivers/net/ethernet/mscc/ocelot_flower.c
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
--- a/drivers/net/mdio/mdio-mscc-miim.c
+++ b/drivers/net/mdio/mdio-mscc-miim.c
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
--- a/drivers/net/phy/mscc/mscc_main.c
+++ b/drivers/net/phy/mscc/mscc_main.c
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
--- a/drivers/nvme/target/configfs.c
+++ b/drivers/nvme/target/configfs.c
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
--- a/drivers/vhost/vsock.c
+++ b/drivers/vhost/vsock.c
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
--- a/include/net/af_vsock.h
+++ b/include/net/af_vsock.h
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
--- a/kernel/configs/debug.config
+++ b/kernel/configs/debug.config
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
--- a/net/netfilter/nf_nat_core.c
+++ b/net/netfilter/nf_nat_core.c
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
--- a/net/vmw_vsock/virtio_transport.c
+++ b/net/vmw_vsock/virtio_transport.c
--- a/net/vmw_vsock/vmci_transport.c
+++ b/net/vmw_vsock/vmci_transport.c
--- a/tools/testing/selftests/netfilter/nft_nat.sh
+++ b/tools/testing/selftests/netfilter/nft_nat.sh
--- a/tools/testing/selftests/vm/Makefile
+++ b/tools/testing/selftests/vm/Makefile