diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-07 17:41:23 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-07 17:41:23 +0200 |
| commit | e5486d509f7ef51301e699d5f7b2159b4314be13 (patch) | |
| tree | 3793b0bd14aaf50d24cd40a6f75561b5fa70ec6e | |
| parent | 754d019eff592261d0e6ed1e8f0c2d9a65e3ef67 (diff) | |
| parent | 657252c44d87b9d3d4fa61ce0dd0338b5fc35e6c (diff) | |
| download | kernel-e5486d509f7ef51301e699d5f7b2159b4314be13.tar.gz kernel-e5486d509f7ef51301e699d5f7b2159b4314be13.tar.xz kernel-e5486d509f7ef51301e699d5f7b2159b4314be13.zip | |
Merge remote-tracking branch 'origin/f35' into f35-user-thl-vanilla-fedora
| -rw-r--r-- | patch-5.14-redhat.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/patch-5.14-redhat.patch b/patch-5.14-redhat.patch index e295f5092..61a0b219f 100644 --- a/patch-5.14-redhat.patch +++ b/patch-5.14-redhat.patch @@ -3072,3 +3072,24 @@ index e4f5bd388a3c..000000000000 -} - -char LICENSE[] SEC("license") = "GPL"; +commit e11905f1a6ea9f03a9f1a3b061a1a581536a2850 +Author: Justin M. Forbes <jforbes@fedoraproject.org> +Date: Fri Sep 3 10:54:07 2021 -0500 + + Revert "team: mark team driver as deprecated" + + This is a RHEL only patch and should not be in the Fedora kernel. + +diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c +index f6b43adb2ced..dd7917cab2b1 100644 +--- a/drivers/net/team/team.c ++++ b/drivers/net/team/team.c +@@ -3045,8 +3045,6 @@ static int __init team_module_init(void) + if (err) + goto err_nl_init; + +- mark_hardware_deprecated(DRV_NAME); +- + return 0; + + err_nl_init: |