diff --git a/configs/fedora/generic/CONFIG_IMX_MBOX b/configs/fedora/generic/CONFIG_IMX_MBOX new file mode 100644 index 0000000..97c532f --- /dev/null +++ b/configs/fedora/generic/CONFIG_IMX_MBOX @@ -0,0 +1 @@ +# CONFIG_IMX_MBOX is not set diff --git a/configs/fedora/generic/CONFIG_PCIE_MOBIVEIL b/configs/fedora/generic/CONFIG_PCIE_MOBIVEIL new file mode 100644 index 0000000..bfed4f7 --- /dev/null +++ b/configs/fedora/generic/CONFIG_PCIE_MOBIVEIL @@ -0,0 +1 @@ +# CONFIG_PCIE_MOBIVEIL is not set diff --git a/configs/fedora/generic/CONFIG_PCIE_XILINX b/configs/fedora/generic/CONFIG_PCIE_XILINX new file mode 100644 index 0000000..510085b --- /dev/null +++ b/configs/fedora/generic/CONFIG_PCIE_XILINX @@ -0,0 +1 @@ +# CONFIG_PCIE_XILINX is not set diff --git a/gitrev b/gitrev index 4832cb6..4f96d8e 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -f91e654474d413201ae578820fb63f8a811f6c4e +5c60a7389d795e001c8748b458eb76e3a5b6008c diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index dc6adc7..c905882 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -2384,6 +2384,7 @@ CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_IPUV3_CORE is not set +# CONFIG_IMX_MBOX is not set CONFIG_INA2XX_ADC=m CONFIG_INDIRECT_PIO=y CONFIG_INET6_AH=m @@ -4324,12 +4325,14 @@ CONFIG_PCIE_DW=y CONFIG_PCIE_ECRC=y CONFIG_PCIE_HISI_STB=y CONFIG_PCIE_KIRIN=y +# CONFIG_PCIE_MOBIVEIL is not set # CONFIG_PCI_ENDPOINT is not set # CONFIG_PCI_ENDPOINT_TEST is not set CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y CONFIG_PCIE_QCOM=y CONFIG_PCIE_ROCKCHIP_HOST=m +# CONFIG_PCIE_XILINX is not set CONFIG_PCIE_XILINX_NWL=y # CONFIG_PCI_FTPCI100 is not set # CONFIG_PCI_GOOLPC is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 02e1e17..1070de2 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -2366,6 +2366,7 @@ CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_IPUV3_CORE is not set +# CONFIG_IMX_MBOX is not set CONFIG_INA2XX_ADC=m CONFIG_INDIRECT_PIO=y CONFIG_INET6_AH=m @@ -4302,12 +4303,14 @@ CONFIG_PCIE_DW=y CONFIG_PCIE_ECRC=y CONFIG_PCIE_HISI_STB=y CONFIG_PCIE_KIRIN=y +# CONFIG_PCIE_MOBIVEIL is not set # CONFIG_PCI_ENDPOINT is not set # CONFIG_PCI_ENDPOINT_TEST is not set CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y CONFIG_PCIE_QCOM=y CONFIG_PCIE_ROCKCHIP_HOST=m +# CONFIG_PCIE_XILINX is not set CONFIG_PCIE_XILINX_NWL=y # CONFIG_PCI_FTPCI100 is not set # CONFIG_PCI_GOOLPC is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index dda2ebc..29b83f5 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -2506,6 +2506,7 @@ CONFIG_IMX7_PM_DOMAINS=y CONFIG_IMX_DMA=m CONFIG_IMX_GPCV2=y CONFIG_IMX_IPUV3_CORE=m +# CONFIG_IMX_MBOX is not set CONFIG_IMX_REMOTEPROC=m CONFIG_IMX_SDMA=m CONFIG_IMX_THERMAL=m @@ -4579,6 +4580,7 @@ CONFIG_PCIE_DW_HOST=y CONFIG_PCIE_DW_PLAT_HOST=y CONFIG_PCIE_DW=y CONFIG_PCIE_ECRC=y +# CONFIG_PCIE_MOBIVEIL is not set # CONFIG_PCI_ENDPOINT is not set # CONFIG_PCI_ENDPOINT_TEST is not set CONFIG_PCIEPORTBUS=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 9d55daf..3d7c45c 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -2385,6 +2385,7 @@ CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_IPUV3_CORE is not set +# CONFIG_IMX_MBOX is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -4358,11 +4359,13 @@ CONFIG_PCIE_DW_HOST=y CONFIG_PCIE_DW_PLAT_HOST=y CONFIG_PCIE_DW=y CONFIG_PCIE_ECRC=y +# CONFIG_PCIE_MOBIVEIL is not set # CONFIG_PCI_ENDPOINT is not set # CONFIG_PCI_ENDPOINT_TEST is not set CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y CONFIG_PCIE_ROCKCHIP_HOST=m +# CONFIG_PCIE_XILINX is not set CONFIG_PCI_EXYNOS=y # CONFIG_PCI_FTPCI100 is not set # CONFIG_PCI_GOOLPC is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 8a75497..955bb15 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -2367,6 +2367,7 @@ CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_IPUV3_CORE is not set +# CONFIG_IMX_MBOX is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -4336,11 +4337,13 @@ CONFIG_PCIE_DW_HOST=y CONFIG_PCIE_DW_PLAT_HOST=y CONFIG_PCIE_DW=y CONFIG_PCIE_ECRC=y +# CONFIG_PCIE_MOBIVEIL is not set # CONFIG_PCI_ENDPOINT is not set # CONFIG_PCI_ENDPOINT_TEST is not set CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y CONFIG_PCIE_ROCKCHIP_HOST=m +# CONFIG_PCIE_XILINX is not set CONFIG_PCI_EXYNOS=y # CONFIG_PCI_FTPCI100 is not set # CONFIG_PCI_GOOLPC is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 9a8e249..8704b7d 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -2488,6 +2488,7 @@ CONFIG_IMX7_PM_DOMAINS=y CONFIG_IMX_DMA=m CONFIG_IMX_GPCV2=y CONFIG_IMX_IPUV3_CORE=m +# CONFIG_IMX_MBOX is not set CONFIG_IMX_REMOTEPROC=m CONFIG_IMX_SDMA=m CONFIG_IMX_THERMAL=m @@ -4557,6 +4558,7 @@ CONFIG_PCIE_DW_HOST=y CONFIG_PCIE_DW_PLAT_HOST=y CONFIG_PCIE_DW=y CONFIG_PCIE_ECRC=y +# CONFIG_PCIE_MOBIVEIL is not set # CONFIG_PCI_ENDPOINT is not set # CONFIG_PCI_ENDPOINT_TEST is not set CONFIG_PCIEPORTBUS=y diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 6a9b4f1..695f99d 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -2202,6 +2202,7 @@ CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_MBOX is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -4144,10 +4145,12 @@ CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_PLAT_HOST is not set CONFIG_PCIE_ECRC=y +# CONFIG_PCIE_MOBIVEIL is not set # CONFIG_PCI_ENDPOINT is not set # CONFIG_PCI_ENDPOINT_TEST is not set CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y +# CONFIG_PCIE_XILINX is not set # CONFIG_PCI_FTPCI100 is not set CONFIG_PCI_GOANY=y # CONFIG_PCI_GOBIOS is not set diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 631db1f..aa135a3 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -2223,6 +2223,7 @@ CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_MBOX is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -4167,10 +4168,12 @@ CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_PLAT_HOST is not set CONFIG_PCIE_ECRC=y +# CONFIG_PCIE_MOBIVEIL is not set # CONFIG_PCI_ENDPOINT is not set # CONFIG_PCI_ENDPOINT_TEST is not set CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y +# CONFIG_PCIE_XILINX is not set # CONFIG_PCI_FTPCI100 is not set CONFIG_PCI_GOANY=y # CONFIG_PCI_GOBIOS is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 4b5df0c..3afbaf7 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -2223,6 +2223,7 @@ CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_MBOX is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -4167,10 +4168,12 @@ CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_PLAT_HOST is not set CONFIG_PCIE_ECRC=y +# CONFIG_PCIE_MOBIVEIL is not set # CONFIG_PCI_ENDPOINT is not set # CONFIG_PCI_ENDPOINT_TEST is not set CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y +# CONFIG_PCIE_XILINX is not set # CONFIG_PCI_FTPCI100 is not set CONFIG_PCI_GOANY=y # CONFIG_PCI_GOBIOS is not set diff --git a/kernel-i686.config b/kernel-i686.config index da03a78..1540d4c 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -2202,6 +2202,7 @@ CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_MBOX is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -4144,10 +4145,12 @@ CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_PLAT_HOST is not set CONFIG_PCIE_ECRC=y +# CONFIG_PCIE_MOBIVEIL is not set # CONFIG_PCI_ENDPOINT is not set # CONFIG_PCI_ENDPOINT_TEST is not set CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y +# CONFIG_PCIE_XILINX is not set # CONFIG_PCI_FTPCI100 is not set CONFIG_PCI_GOANY=y # CONFIG_PCI_GOBIOS is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 0c28bca..cc6f425 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -2058,6 +2058,7 @@ CONFIG_IMA_READ_POLICY=y CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_MBOX is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -3897,10 +3898,12 @@ CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_PLAT_HOST is not set CONFIG_PCIE_ECRC=y +# CONFIG_PCIE_MOBIVEIL is not set # CONFIG_PCI_ENDPOINT is not set # CONFIG_PCI_ENDPOINT_TEST is not set # CONFIG_PCIEPORTBUS is not set CONFIG_PCIE_PTM=y +# CONFIG_PCIE_XILINX is not set # CONFIG_PCI_FTPCI100 is not set # CONFIG_PCI_GOOLPC is not set CONFIG_PCI_HERMES=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 48a93c8..5eeaa2b 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -2037,6 +2037,7 @@ CONFIG_IMA_READ_POLICY=y CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_MBOX is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -3872,10 +3873,12 @@ CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_PLAT_HOST is not set CONFIG_PCIE_ECRC=y +# CONFIG_PCIE_MOBIVEIL is not set # CONFIG_PCI_ENDPOINT is not set # CONFIG_PCI_ENDPOINT_TEST is not set # CONFIG_PCIEPORTBUS is not set CONFIG_PCIE_PTM=y +# CONFIG_PCIE_XILINX is not set # CONFIG_PCI_FTPCI100 is not set # CONFIG_PCI_GOOLPC is not set CONFIG_PCI_HERMES=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 917c5ab..4255fb0 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -2012,6 +2012,7 @@ CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_MBOX is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -3830,10 +3831,12 @@ CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_PLAT_HOST is not set CONFIG_PCIE_ECRC=y +# CONFIG_PCIE_MOBIVEIL is not set # CONFIG_PCI_ENDPOINT is not set # CONFIG_PCI_ENDPOINT_TEST is not set CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y +# CONFIG_PCIE_XILINX is not set # CONFIG_PCI_FTPCI100 is not set # CONFIG_PCI_GOOLPC is not set CONFIG_PCI_HERMES=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 871cc9c..9d5d8ac 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1991,6 +1991,7 @@ CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_MBOX is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -3805,10 +3806,12 @@ CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_PLAT_HOST is not set CONFIG_PCIE_ECRC=y +# CONFIG_PCIE_MOBIVEIL is not set # CONFIG_PCI_ENDPOINT is not set # CONFIG_PCI_ENDPOINT_TEST is not set CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y +# CONFIG_PCIE_XILINX is not set # CONFIG_PCI_FTPCI100 is not set # CONFIG_PCI_GOOLPC is not set CONFIG_PCI_HERMES=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 9eb8107..ad5a4a5 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -2268,6 +2268,7 @@ CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_MBOX is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -4214,10 +4215,12 @@ CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_PLAT_HOST is not set CONFIG_PCIE_ECRC=y +# CONFIG_PCIE_MOBIVEIL is not set # CONFIG_PCI_ENDPOINT is not set # CONFIG_PCI_ENDPOINT_TEST is not set CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y +# CONFIG_PCIE_XILINX is not set # CONFIG_PCI_FTPCI100 is not set # CONFIG_PCI_GOOLPC is not set CONFIG_PCI_HERMES=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index f85d877..efb9128 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2247,6 +2247,7 @@ CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_MBOX is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -4191,10 +4192,12 @@ CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_PLAT_HOST is not set CONFIG_PCIE_ECRC=y +# CONFIG_PCIE_MOBIVEIL is not set # CONFIG_PCI_ENDPOINT is not set # CONFIG_PCI_ENDPOINT_TEST is not set CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y +# CONFIG_PCIE_XILINX is not set # CONFIG_PCI_FTPCI100 is not set # CONFIG_PCI_GOOLPC is not set CONFIG_PCI_HERMES=m diff --git a/kernel.spec b/kernel.spec index 00b39c8..cbe3e58 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -614,9 +614,6 @@ Patch501: Fix-for-module-sig-verification.patch # rhbz 1431375 Patch502: input-rmi4-remove-the-need-for-artifical-IRQ.patch -# rhbz 1470995 -Patch504: kexec-bzimage-verify-pe-signature-fix.patch - # For quiet / flickerfree boot, all queued for merging into 4.19-rc1 Patch525: 0005-efi-bgrt-Drop-__initdata-from-bgrt_image_size.patch Patch526: 0006-efifb-Copy-the-ACPI-BGRT-boot-graphics-to-the-frameb.patch @@ -1884,6 +1881,10 @@ fi # # %changelog +* Fri Aug 17 2018 Jeremy Cline - 4.19.0-0.rc0.git4.1 +- Linux v4.18-8108-g5c60a7389d79 +- Re-enable AEGIS and MORUS ciphers (rhbz 1610180) + * Thu Aug 16 2018 Jeremy Cline - 4.19.0-0.rc0.git3.1 - Linux v4.18-7873-gf91e654474d4 diff --git a/kexec-bzimage-verify-pe-signature-fix.patch b/kexec-bzimage-verify-pe-signature-fix.patch deleted file mode 100644 index 6c8a51b..0000000 --- a/kexec-bzimage-verify-pe-signature-fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Dave Young - -Fix kexec_file_load pefile signature verification - -Similar with Fix-for-module-sig-verification.patch, kexec_file syscall also -need pass 1UL to verify_pefile_signature so that secondary keys can be used. - -Fedora bug -https://bugzilla.redhat.com/show_bug.cgi?id=1470995 - -Latest upstream effort is below: -https://www.spinics.net/lists/kernel/msg2825184.html - -Ideally this need an upstream fix, but since nobody response we can workaround -it like the module code did. - -Signed-off-by: Dave Young ---- - arch/x86/kernel/kexec-bzimage64.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- linux-x86.orig/arch/x86/kernel/kexec-bzimage64.c -+++ linux-x86/arch/x86/kernel/kexec-bzimage64.c -@@ -533,7 +533,7 @@ static int bzImage64_cleanup(void *loade - static int bzImage64_verify_sig(const char *kernel, unsigned long kernel_len) - { - return verify_pefile_signature(kernel, kernel_len, -- NULL, -+ (void *)1UL, - VERIFYING_KEXEC_PE_SIGNATURE); - } - #endif --- -2.17.0 diff --git a/qcom-msm89xx-fixes.patch b/qcom-msm89xx-fixes.patch index f7ac281..0ef0ad3 100644 --- a/qcom-msm89xx-fixes.patch +++ b/qcom-msm89xx-fixes.patch @@ -1,7 +1,7 @@ -From 40cb129048e5d2456da8d9d6468f292da3071b91 Mon Sep 17 00:00:00 2001 +From cadf6ce5a3929b42b0e63fe36d0c08bf6b59f25e Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Fri, 30 Jun 2017 16:40:23 -0400 -Subject: [PATCH 4/6] thermal: qcom: tsens: fix crash due to incorrect __init +Subject: [PATCH] thermal: qcom: tsens: fix crash due to incorrect __init init_common() is called from probe, which can happen after the __init section is already unloaded in the case of -EPROBE_DEFER. Causing a @@ -15,10 +15,10 @@ Acked-by: Bjorn Andersson 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c -index b1449ad67fc0..22ad37c9808c 100644 +index 6207d8d92351..920167c6eac5 100644 --- a/drivers/thermal/qcom/tsens-common.c +++ b/drivers/thermal/qcom/tsens-common.c -@@ -123,7 +123,7 @@ static const struct regmap_config tsens_config = { +@@ -124,7 +124,7 @@ static const struct regmap_config tsens_config = { .reg_stride = 4, }; @@ -26,6 +26,7 @@ index b1449ad67fc0..22ad37c9808c 100644 +int init_common(struct tsens_device *tmdev) { void __iomem *base; - + struct resource *res; -- -2.13.0 +2.17.1 + diff --git a/sources b/sources index e2771a0..91f382c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-4.18.tar.xz) = 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038 -SHA512 (patch-4.18-git3.xz) = 32c49ed9e4ad43ee9735d6de87461738727c6b8b536969f6a4a44db314d2446c45f27bfb40971f23086902966512425e7ff969825252d7b69e97e933fad683a4 +SHA512 (patch-4.18-git4.xz) = 9fcca1932f896fca915d7be48c09cbe70fa086eb8fbc63818abcab2be7de1b6710f2c23593a9549feb9a6a62dff50a485e4869209d8d5c7fcbfb1c2a37720a15