diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-11 07:16:50 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-11 07:16:50 +0200 |
| commit | fb4522c36eff59e3ab46c6e99ae6fb1da7456c5d (patch) | |
| tree | fe9ff9003c8d6bb0a49647fea5424f00a04c330c /patch-5.14.0-redhat.patch | |
| parent | 6e985586a0fb2d3d024da400e685e8576e4dd284 (diff) | |
| parent | 5a12ab721169990797a927aa64d94209fe679bbe (diff) | |
| download | kernel-fb4522c36eff59e3ab46c6e99ae6fb1da7456c5d.tar.gz kernel-fb4522c36eff59e3ab46c6e99ae6fb1da7456c5d.tar.xz kernel-fb4522c36eff59e3ab46c6e99ae6fb1da7456c5d.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc5.20210810git9a73fa375d58.43.vanilla.1.fc34
Diffstat (limited to 'patch-5.14.0-redhat.patch')
| -rw-r--r-- | patch-5.14.0-redhat.patch | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/patch-5.14.0-redhat.patch b/patch-5.14.0-redhat.patch index e41bf85c5..2f7f937d4 100644 --- a/patch-5.14.0-redhat.patch +++ b/patch-5.14.0-redhat.patch @@ -26,7 +26,6 @@ drivers/iommu/iommu.c | 22 + drivers/message/fusion/mptsas.c | 10 + drivers/message/fusion/mptspi.c | 11 + - drivers/net/ethernet/intel/ice/ice_main.c | 1 + drivers/net/team/team.c | 2 + drivers/net/wireguard/main.c | 7 + drivers/nvme/host/core.c | 22 +- @@ -82,7 +81,7 @@ tools/testing/selftests/bpf/progs/linked_maps2.c | 76 --- tools/testing/selftests/bpf/progs/linked_vars1.c | 54 -- tools/testing/selftests/bpf/progs/linked_vars2.c | 55 --- - 84 files changed, 1168 insertions(+), 1505 deletions(-) + 83 files changed, 1167 insertions(+), 1505 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index bdb22006f713..61a3a4a4730b 100644 @@ -1233,18 +1232,6 @@ index af0ce5611e4a..1c226920c12d 100644 return 0; out_mptspi_probe: -diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c -index ef8d1815af56..702abf98c068 100644 ---- a/drivers/net/ethernet/intel/ice/ice_main.c -+++ b/drivers/net/ethernet/intel/ice/ice_main.c -@@ -5063,6 +5063,7 @@ static int __init ice_module_init(void) - - pr_info("%s\n", ice_driver_string); - pr_info("%s\n", ice_copyright); -+ mark_tech_preview(DRV_SUMMARY, THIS_MODULE); - - ice_wq = alloc_workqueue("%s", WQ_MEM_RECLAIM, 0, KBUILD_MODNAME); - if (!ice_wq) { diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index dd7917cab2b1..f6b43adb2ced 100644 --- a/drivers/net/team/team.c |