summaryrefslogtreecommitdiffstats
path: root/patch-5.12.0-redhat.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-03-18 11:31:56 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-03-18 11:31:56 -0500
commitc7408e676d411a20979d07c4b6406d334f3b9017 (patch)
treea24597fb48427293d08ed66d12c5210a48727168 /patch-5.12.0-redhat.patch
parent613e26bbec9f6f62fe7f9989c39370c1273d545a (diff)
downloadkernel-c7408e676d411a20979d07c4b6406d334f3b9017.tar.gz
kernel-c7408e676d411a20979d07c4b6406d334f3b9017.tar.xz
kernel-c7408e676d411a20979d07c4b6406d334f3b9017.zip
kernel-5.12.0-0.rc3.20210318git6417f03132a6.171
* Thu Mar 18 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc3.20210318git6417f03132a6.171] - Turn off weak-modules for Fedora (Justin M. Forbes) - redhat: enable CONFIG_FW_LOADER_COMPRESS for ARK (Herton R. Krzesinski) [1939095] Resolves: rhbz#1939095 Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-5.12.0-redhat.patch')
-rw-r--r--patch-5.12.0-redhat.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/patch-5.12.0-redhat.patch b/patch-5.12.0-redhat.patch
index e4f89e857..5c9542c00 100644
--- a/patch-5.12.0-redhat.patch
+++ b/patch-5.12.0-redhat.patch
@@ -1325,11 +1325,11 @@ index 90fcddb76f46..f22d7b2608ce 100644
{ 0 }
};
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
-index 38369766511c..ceaa197c7547 100644
+index f135a10f582b..99b17b05cab1 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
-@@ -83,7 +83,9 @@ MODULE_DESCRIPTION("Driver for HP Smart Array Controller version " \
- MODULE_SUPPORTED_DEVICE("HP Smart Array Controllers");
+@@ -82,7 +82,9 @@ MODULE_DESCRIPTION("Driver for HP Smart Array Controller version " \
+ HPSA_DRIVER_VERSION);
MODULE_VERSION(HPSA_DRIVER_VERSION);
MODULE_LICENSE("GPL");
+#ifndef CONFIG_RHEL_DIFFERENCES
@@ -1338,7 +1338,7 @@ index 38369766511c..ceaa197c7547 100644
static int hpsa_simple_mode;
module_param(hpsa_simple_mode, int, S_IRUGO|S_IWUSR);
-@@ -145,10 +147,12 @@ static const struct pci_device_id hpsa_pci_device_id[] = {
+@@ -144,10 +146,12 @@ static const struct pci_device_id hpsa_pci_device_id[] = {
{PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x007D},
{PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x0088},
{PCI_VENDOR_ID_HP, 0x333f, 0x103c, 0x333f},
@@ -1535,10 +1535,10 @@ index 7bd9a4a04ad5..124a65ba4c40 100644
};
MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl);
diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
-index c53f456fbd09..ea190660c86e 100644
+index a1dacb6e993e..2d751d13a3eb 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
-@@ -8313,6 +8313,18 @@ static const struct pci_device_id pqi_pci_id_table[] = {
+@@ -8312,6 +8312,18 @@ static const struct pci_device_id pqi_pci_id_table[] = {
PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
0x19e5, 0xd22c)
},
@@ -1557,7 +1557,7 @@ index c53f456fbd09..ea190660c86e 100644
{
PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
PCI_VENDOR_ID_ADAPTEC2, 0x0110)
-@@ -8453,6 +8465,10 @@ static const struct pci_device_id pqi_pci_id_table[] = {
+@@ -8452,6 +8464,10 @@ static const struct pci_device_id pqi_pci_id_table[] = {
PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
PCI_VENDOR_ID_ADVANTECH, 0x8312)
},
@@ -1735,10 +1735,10 @@ index fb7f3193753d..0f91ae3361e6 100644
*
* @perf_event_open:
diff --git a/include/linux/module.h b/include/linux/module.h
-index 59f094fa6f74..28468e91a6a6 100644
+index da4b6fbe8ebe..293730daf96b 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
-@@ -372,6 +372,7 @@ struct module {
+@@ -369,6 +369,7 @@ struct module {
struct module_attribute *modinfo_attrs;
const char *version;
const char *srcversion;