From 08b72ac0fb4dec150a24ac32e62ddee2421991b9 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 21 Dec 2020 14:39:31 -0600 Subject: kernel-5.11.0-0.rc0.20201221gite37b12e4bb21.106 * Mon Dec 21 2020 Fedora Kernel Team [5.11.0-0.rc0.20201221gite37b12e4bb21.106] - build_configs.sh: Fix syntax flagged by shellcheck (Ben Crocker) - genspec.sh: Fix syntax flagged by shellcheck (Ben Crocker) - ark-rebase-patches.sh: Fix for shellcheck (Ben Crocker) - ark-create-release.sh: Fix syntax flagged by shellcheck (Ben Crocker) - merge-subtrees.sh: Fix syntax flagged by shellcheck (Ben Crocker) - rh-dist-git.sh: Fix syntax flagged by shellcheck (Ben Crocker) - update_scripts.sh: Fix syntax flagged by shellcheck (Ben Crocker) - x86_rngd.sh: Fix syntax flagged by shellcheck (Ben Crocker) - parallel_xz.sh: Fix syntax flagged by shellcheck (Ben Crocker) - expand_srpm.sh: Fix syntax flagged by shellcheck (Ben Crocker) - create-tarball.sh: Fix syntax flagged by shellcheck (Ben Crocker) - generate_bls_conf.sh: Fix syntax flagged by shellcheck (Ben Crocker) - clone_tree.sh: Fix syntax flagged by shellcheck (Ben Crocker) - new_release.sh: Fix syntax flagged by shellcheck (Ben Crocker) - download_cross.sh: Fix syntax flagged by shellcheck (Ben Crocker) - create_distgit_changelog.sh: Fix syntax flagged by shellcheck (Ben Crocker) - generate_cross_report.sh: Fix syntax flagged by shellcheck (Ben Crocker) - run_kabi-dw.sh: Fix syntax flagged by shellcheck (Ben Crocker) - mod-blacklist.sh: Fix syntax flagged by shellcheck (Ben Crocker) - scripts/configdiff.sh: Fix syntax flagged by shellcheck (Ben Crocker) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- patch-5.11.0-redhat.patch | 85 ++++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 41 deletions(-) (limited to 'patch-5.11.0-redhat.patch') diff --git a/patch-5.11.0-redhat.patch b/patch-5.11.0-redhat.patch index 5c1fab645..aa33986db 100644 --- a/patch-5.11.0-redhat.patch +++ b/patch-5.11.0-redhat.patch @@ -94,10 +94,10 @@ index 75a9dd98e76e..3ff3291551f9 100644 Boot into System Kernel diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index c0ca130fe3c9..fb0da333212d 100644 +index c722ec19cd00..3b490fce3392 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -5521,6 +5521,14 @@ +@@ -5526,6 +5526,14 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -240,7 +240,7 @@ index e30cf02da8b8..91c8dfc1f8a7 100644 $(version_h): FORCE diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index ba937d85cb6c..eace8b69c0a8 100644 +index b8ade91281bc..07efd0cb7715 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1482,9 +1482,9 @@ config HIGHMEM @@ -287,7 +287,7 @@ index a13d90206472..6a6aae01755b 100644 #define get_user(x, p) \ diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 9f0139ba8a1d..bb08acd5baef 100644 +index 81463eb537bb..5bd644114103 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -895,7 +895,7 @@ endchoice @@ -336,7 +336,7 @@ index a9e2c7295b35..6ff11f3a2d47 100644 /* * DIAG 308 support diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c -index 98b3aca1de8e..1cace7c90d41 100644 +index 7a21eca498aa..565f143c9858 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c @@ -2215,3 +2215,8 @@ int ipl_report_free(struct ipl_report *report) @@ -349,7 +349,7 @@ index 98b3aca1de8e..1cace7c90d41 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index 1f16a03be995..5fc4d7c069ab 100644 +index 1fbed91c73bc..73f5724342b1 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -360,7 +360,7 @@ index 1f16a03be995..5fc4d7c069ab 100644 #include #include -@@ -1101,6 +1102,9 @@ void __init setup_arch(char **cmdline_p) +@@ -1100,6 +1101,9 @@ void __init setup_arch(char **cmdline_p) log_component_list(); @@ -383,7 +383,7 @@ index 35ad8480c464..fade48ea4c2d 100644 setup_force_cpu_cap(X86_FEATURE_CPUID); cpu_parse_early_param(); diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index a23130c86bdd..6c7ed7524f85 100644 +index 740f3bdb3f61..26c35aa38ea7 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -19,6 +19,7 @@ @@ -469,7 +469,7 @@ index a23130c86bdd..6c7ed7524f85 100644 dmi_setup(); /* -@@ -1107,19 +1160,7 @@ void __init setup_arch(char **cmdline_p) +@@ -1113,19 +1166,7 @@ void __init setup_arch(char **cmdline_p) /* Allocate bigger log buffer */ setup_log_buf(1); @@ -490,7 +490,7 @@ index a23130c86bdd..6c7ed7524f85 100644 reserve_initrd(); -@@ -1228,6 +1269,8 @@ void __init setup_arch(char **cmdline_p) +@@ -1234,6 +1275,8 @@ void __init setup_arch(char **cmdline_p) efi_apply_memmap_quirks(); #endif @@ -637,7 +637,7 @@ index bbf7029e224b..cf7faa970dd6 100644 dmi_decode_ipmi((const struct dmi_header *) dev->device_data); diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c -index 8774a3b8ff95..8c3d67367b9c 100644 +index c44ad18464f1..3ec1db4cbbc3 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -34,6 +34,7 @@ @@ -648,7 +648,7 @@ index 8774a3b8ff95..8c3d67367b9c 100644 #include #define IPMI_DRIVER_VERSION "39.2" -@@ -5173,8 +5174,21 @@ static int __init ipmi_init_msghandler_mod(void) +@@ -5174,8 +5175,21 @@ static int __init ipmi_init_msghandler_mod(void) { int rv; @@ -1622,7 +1622,7 @@ index 258d5fe3d395..f7298e3dc8f3 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index 0f4dc25d46c9..bd962ee8bc4b 100644 +index ffeebda8d6de..2314da0ce11c 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -7,6 +7,7 @@ @@ -1633,11 +1633,10 @@ index 0f4dc25d46c9..bd962ee8bc4b 100644 #include #include #include -@@ -3031,3 +3032,24 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle) - return ops->sva_get_pasid(handle); +@@ -3047,6 +3048,27 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle) } EXPORT_SYMBOL_GPL(iommu_sva_get_pasid); -+ + +#ifdef CONFIG_ARM64 +static int __init iommu_quirks(void) +{ @@ -1658,11 +1657,15 @@ index 0f4dc25d46c9..bd962ee8bc4b 100644 +} +arch_initcall(iommu_quirks); +#endif ++ + /* + * Changes the default domain of an iommu group that has *only* one device + * diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c -index 18b91ea1a353..b71f77a5799f 100644 +index 5eb0b3361e4e..1d071bfec4bd 100644 --- a/drivers/message/fusion/mptsas.c +++ b/drivers/message/fusion/mptsas.c -@@ -5290,6 +5290,11 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id) +@@ -5315,6 +5315,11 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id) ioc, MPI_SAS_OP_CLEAR_ALL_PERSISTENT); } @@ -1674,7 +1677,7 @@ index 18b91ea1a353..b71f77a5799f 100644 error = scsi_add_host(sh, &ioc->pcidev->dev); if (error) { dprintk(ioc, printk(MYIOC_s_ERR_FMT -@@ -5353,6 +5358,10 @@ static void mptsas_remove(struct pci_dev *pdev) +@@ -5378,6 +5383,10 @@ static void mptsas_remove(struct pci_dev *pdev) } static struct pci_device_id mptsas_pci_table[] = { @@ -1685,7 +1688,7 @@ index 18b91ea1a353..b71f77a5799f 100644 { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1064, PCI_ANY_ID, PCI_ANY_ID }, { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068, -@@ -5365,6 +5374,7 @@ static struct pci_device_id mptsas_pci_table[] = { +@@ -5390,6 +5399,7 @@ static struct pci_device_id mptsas_pci_table[] = { PCI_ANY_ID, PCI_ANY_ID }, { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068_820XELP, PCI_ANY_ID, PCI_ANY_ID }, @@ -1694,7 +1697,7 @@ index 18b91ea1a353..b71f77a5799f 100644 }; MODULE_DEVICE_TABLE(pci, mptsas_pci_table); diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c -index eabc4de5816c..1f458e35effb 100644 +index af0ce5611e4a..1c226920c12d 100644 --- a/drivers/message/fusion/mptspi.c +++ b/drivers/message/fusion/mptspi.c @@ -1238,12 +1238,17 @@ static struct spi_function_template mptspi_transport_functions = { @@ -1839,7 +1842,7 @@ index 653660e3ba9e..98851d00dc4d 100644 * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c -index 8f3772480582..b2ced7ed9d8e 100644 +index 3168915adaa7..71b48e29b708 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c @@ -78,6 +78,7 @@ char aac_driver_version[] = AAC_DRIVER_FULL_VERSION; @@ -1859,7 +1862,7 @@ index 8f3772480582..b2ced7ed9d8e 100644 { 0x9005, 0x028c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 63 }, /* Adaptec PMC Series 7 (Denali) */ { 0x9005, 0x028d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 64 }, /* Adaptec PMC Series 8 */ diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c -index 5c3513a4b450..0d59aca2cf58 100644 +index 90fcddb76f46..f22d7b2608ce 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c @@ -370,11 +370,13 @@ static int beiscsi_eh_device_reset(struct scsi_cmnd *sc) @@ -1877,7 +1880,7 @@ index 5c3513a4b450..0d59aca2cf58 100644 { 0 } }; diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c -index 8df70c92911d..754a912d30a6 100644 +index f4d3747cfa0b..b41594b315fe 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -83,7 +83,9 @@ MODULE_DESCRIPTION("Driver for HP Smart Array Controller version " \ @@ -1984,7 +1987,7 @@ index d48414e295a0..ba0e384412c9 100644 PCI_ANY_ID, PCI_ANY_ID, }, {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC, diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c -index e158d3d62056..f63c55b6408c 100644 +index 6e4bf05c6d77..0921b0aa9670 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -133,6 +133,7 @@ static void megasas_get_pd_info(struct megasas_instance *instance, @@ -2004,10 +2007,10 @@ index e158d3d62056..f63c55b6408c 100644 /* Fusion */ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_PLASMA)}, diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c -index 5f845d7094fc..28d623e6c159 100644 +index c8b09a81834d..24c8d6ea8838 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c -@@ -11309,6 +11309,7 @@ bool scsih_ncq_prio_supp(struct scsi_device *sdev) +@@ -12267,6 +12267,7 @@ bool scsih_ncq_prio_supp(struct scsi_device *sdev) * The pci device ids are defined in mpi/mpi2_cnfg.h. */ static const struct pci_device_id mpt3sas_pci_table[] = { @@ -2015,7 +2018,7 @@ index 5f845d7094fc..28d623e6c159 100644 /* Spitfire ~ 2004 */ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2004, PCI_ANY_ID, PCI_ANY_ID }, -@@ -11327,6 +11328,7 @@ static const struct pci_device_id mpt3sas_pci_table[] = { +@@ -12285,6 +12286,7 @@ static const struct pci_device_id mpt3sas_pci_table[] = { PCI_ANY_ID, PCI_ANY_ID }, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2116_2, PCI_ANY_ID, PCI_ANY_ID }, @@ -2023,7 +2026,7 @@ index 5f845d7094fc..28d623e6c159 100644 /* Thunderbolt ~ 2208 */ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_1, PCI_ANY_ID, PCI_ANY_ID }, -@@ -11351,9 +11353,11 @@ static const struct pci_device_id mpt3sas_pci_table[] = { +@@ -12309,9 +12311,11 @@ static const struct pci_device_id mpt3sas_pci_table[] = { PCI_ANY_ID, PCI_ANY_ID }, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP_1, PCI_ANY_ID, PCI_ANY_ID }, @@ -2036,10 +2039,10 @@ index 5f845d7094fc..28d623e6c159 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 f9c8ae9d669e..b5935dce1a9d 100644 +index f80abe28f35a..02d8de118b5f 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c -@@ -7703,6 +7703,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { +@@ -7698,6 +7698,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { }; static struct pci_device_id qla2xxx_pci_tbl[] = { @@ -2047,7 +2050,7 @@ index f9c8ae9d669e..b5935dce1a9d 100644 { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) }, -@@ -7715,13 +7716,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { +@@ -7710,13 +7711,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8432) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432) }, @@ -2067,10 +2070,10 @@ index f9c8ae9d669e..b5935dce1a9d 100644 { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2271) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2261) }, diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c -index 2c23b692e318..684df7268ab3 100644 +index a4b014e1cd8c..4b2b4a88e931 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c -@@ -9867,6 +9867,7 @@ static struct pci_device_id qla4xxx_pci_tbl[] = { +@@ -9864,6 +9864,7 @@ static struct pci_device_id qla4xxx_pci_tbl[] = { .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, }, @@ -2078,7 +2081,7 @@ index 2c23b692e318..684df7268ab3 100644 { .vendor = PCI_VENDOR_ID_QLOGIC, .device = PCI_DEVICE_ID_QLOGIC_ISP8022, -@@ -9885,6 +9886,7 @@ static struct pci_device_id qla4xxx_pci_tbl[] = { +@@ -9882,6 +9883,7 @@ static struct pci_device_id qla4xxx_pci_tbl[] = { .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, }, @@ -2087,10 +2090,10 @@ index 2c23b692e318..684df7268ab3 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 9d0229656681..28da005c3cc2 100644 +index c53f456fbd09..ea190660c86e 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c -@@ -8317,6 +8317,18 @@ static const struct pci_device_id pqi_pci_id_table[] = { +@@ -8313,6 +8313,18 @@ static const struct pci_device_id pqi_pci_id_table[] = { PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, 0x19e5, 0xd22c) }, @@ -2109,7 +2112,7 @@ index 9d0229656681..28da005c3cc2 100644 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, PCI_VENDOR_ID_ADAPTEC2, 0x0110) -@@ -8457,6 +8469,10 @@ static const struct pci_device_id pqi_pci_id_table[] = { +@@ -8453,6 +8465,10 @@ static const struct pci_device_id pqi_pci_id_table[] = { PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, PCI_VENDOR_ID_ADVANTECH, 0x8312) }, @@ -2286,7 +2289,7 @@ index a19adef1f088..57cce0d5c347 100644 * * @perf_event_open: diff --git a/include/linux/module.h b/include/linux/module.h -index c4e7a887f469..6085e7b1cc71 100644 +index 7a0bcb5b1ffc..3088a812acc5 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -372,6 +372,7 @@ struct module { @@ -2786,10 +2789,10 @@ index 825284baaf46..0b2b3f510b16 100644 * if the commandline contains a ':', then that's the extended * syntax -- if not, it must be the classic syntax diff --git a/kernel/module.c b/kernel/module.c -index c3a9e972d3b2..ce85f964e945 100644 +index 4bf30e4b3eaa..b6b813ef93db 100644 --- a/kernel/module.c +++ b/kernel/module.c -@@ -836,6 +836,7 @@ static struct module_attribute modinfo_##field = { \ +@@ -837,6 +837,7 @@ static struct module_attribute modinfo_##field = { \ MODINFO_ATTR(version); MODINFO_ATTR(srcversion); -- cgit