diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-02-01 07:13:45 -0600 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-02-01 07:13:45 -0600 |
| commit | 799a651edc7f50083bf6fa11405ec39a4a6597e5 (patch) | |
| tree | cf55a7b72f93554f28eeb0b1c1ef558c209d69c1 /patch-5.11.0-redhat.patch | |
| parent | a17e23ddd3096f037d4561f11c31f5b965555254 (diff) | |
| download | kernel-799a651edc7f50083bf6fa11405ec39a4a6597e5.tar.gz kernel-799a651edc7f50083bf6fa11405ec39a4a6597e5.tar.xz kernel-799a651edc7f50083bf6fa11405ec39a4a6597e5.zip | |
kernel-5.11.0-0.rc6.141
* Mon Feb 01 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc6.141]
- redhat: replace inline awk script with genlog.py call (Herton R. Krzesinski)
- redhat: add genlog.py script (Herton R. Krzesinski)
- Turn off vdso_install for ppc (Justin M. Forbes)
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-5.11.0-redhat.patch')
| -rw-r--r-- | patch-5.11.0-redhat.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patch-5.11.0-redhat.patch b/patch-5.11.0-redhat.patch index 1ba0d7328..c7c24aa63 100644 --- a/patch-5.11.0-redhat.patch +++ b/patch-5.11.0-redhat.patch @@ -201,7 +201,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index e0af7a4a5598..ef96c9dae155 100644 +index f5842126e89d..5d5845be64e8 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1731,10 +1731,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 c52b9bb0e3ab..3e463dccac33 100644 +index e10ca8929f85..17f256875fa7 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c -@@ -4810,6 +4810,7 @@ static int __init ice_module_init(void) +@@ -4806,6 +4806,7 @@ static int __init ice_module_init(void) pr_info("%s\n", ice_driver_string); pr_info("%s\n", ice_copyright); @@ -2022,7 +2022,7 @@ index c8b09a81834d..24c8d6ea8838 100644 { MPI2_MFGPAGE_VENDORID_LSI, MPI25_MFGPAGE_DEVID_SAS3004, PCI_ANY_ID, PCI_ANY_ID }, diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c -index f80abe28f35a..02d8de118b5f 100644 +index 0e0fe5b09496..5a85e3edf898 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -7698,6 +7698,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { |