diff options
Diffstat (limited to 'patch-5.12.0-redhat.patch')
| -rw-r--r-- | patch-5.12.0-redhat.patch | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/patch-5.12.0-redhat.patch b/patch-5.12.0-redhat.patch index ba5dd61fc..cf03fea63 100644 --- a/patch-5.12.0-redhat.patch +++ b/patch-5.12.0-redhat.patch @@ -28,6 +28,7 @@ drivers/message/fusion/mptsas.c | 10 + drivers/message/fusion/mptspi.c | 11 + drivers/net/ethernet/intel/ice/ice_main.c | 1 + + drivers/net/wireguard/main.c | 1 + drivers/pci/pci-driver.c | 29 ++ drivers/pci/quirks.c | 24 ++ drivers/scsi/aacraid/linit.c | 2 + @@ -62,7 +63,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 64 files changed, 1157 insertions(+), 180 deletions(-) + 65 files changed, 1158 insertions(+), 180 deletions(-) diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst index 75a9dd98e76e..3ff3291551f9 100644 @@ -139,7 +140,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index cc77fd45ca64..c60efba564da 100644 +index 4730cf156f6b..190e162d82e9 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -255,7 +256,7 @@ index 7a21eca498aa..565f143c9858 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index 60da976eee6f..732c3c1ba320 100644 +index 72134f9f6ff5..95970f299ef5 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -1245,10 +1246,10 @@ index af0ce5611e4a..1c226920c12d 100644 out_mptspi_probe: diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c -index 2c23c8f468a5..2833c86986b5 100644 +index d821c687f239..e5c371eab4fb 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c -@@ -4835,6 +4835,7 @@ static int __init ice_module_init(void) +@@ -4832,6 +4832,7 @@ static int __init ice_module_init(void) pr_info("%s\n", ice_driver_string); pr_info("%s\n", ice_copyright); @@ -1256,6 +1257,18 @@ index 2c23c8f468a5..2833c86986b5 100644 ice_wq = alloc_workqueue("%s", WQ_MEM_RECLAIM, 0, KBUILD_MODNAME); if (!ice_wq) { +diff --git a/drivers/net/wireguard/main.c b/drivers/net/wireguard/main.c +index 7a7d5f1a80fc..7df985e31113 100644 +--- a/drivers/net/wireguard/main.c ++++ b/drivers/net/wireguard/main.c +@@ -39,6 +39,7 @@ static int __init mod_init(void) + pr_info("WireGuard " WIREGUARD_VERSION " loaded. See www.wireguard.com for information.\n"); + pr_info("Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.\n"); + ++ mark_tech_preview("WireGuard", THIS_MODULE); + return 0; + + err_netlink: diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index ec44a79e951a..5025827ef396 100644 --- a/drivers/pci/pci-driver.c |