From 6c1fcd028d1b1694a5829aec391f733d1193a6a4 Mon Sep 17 00:00:00 2001 From: RISCi_ATOM Date: Sat, 8 Aug 2020 20:39:17 -0400 Subject: [PATCH] kernel: Bump to 4.14.193 --- include/kernel-version.mk | 4 ++-- target/linux/generic/hack-4.14/220-gc_sections.patch | 4 ++-- target/linux/generic/hack-4.14/221-module_exports.patch | 6 +++--- .../pending-4.14/810-pci_disable_common_quirks.patch | 6 +++--- ...k-set-host-and-device-to-the-same-MAX-payload-size.patch | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 57ac2147c5..bf69f665e7 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.14 = .191 +LINUX_VERSION-4.14 = .193 -LINUX_KERNEL_HASH-4.14.191 = b304a10d987d50e35f97af024532e269e12229f29f3e0ad939753d7be4aecad8 +LINUX_KERNEL_HASH-4.14.193 = ab2388827b31bb2da6c473b1489aae9f0a34bc61022ded4e86cff9abba25ed7f remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/generic/hack-4.14/220-gc_sections.patch b/target/linux/generic/hack-4.14/220-gc_sections.patch index b69d8a01d6..6a4475fc6e 100644 --- a/target/linux/generic/hack-4.14/220-gc_sections.patch +++ b/target/linux/generic/hack-4.14/220-gc_sections.patch @@ -238,7 +238,7 @@ Signed-off-by: Gabor Juhos /* * Data section helpers -@@ -496,7 +497,7 @@ +@@ -497,7 +498,7 @@ #define ENTRY_TEXT \ ALIGN_FUNCTION(); \ VMLINUX_SYMBOL(__entry_text_start) = .; \ @@ -247,7 +247,7 @@ Signed-off-by: Gabor Juhos VMLINUX_SYMBOL(__entry_text_end) = .; #define IRQENTRY_TEXT \ -@@ -603,7 +604,7 @@ +@@ -604,7 +605,7 @@ . = ALIGN(sbss_align); \ .sbss : AT(ADDR(.sbss) - LOAD_OFFSET) { \ *(.dynsbss) \ diff --git a/target/linux/generic/hack-4.14/221-module_exports.patch b/target/linux/generic/hack-4.14/221-module_exports.patch index 250bf1180f..003175c223 100644 --- a/target/linux/generic/hack-4.14/221-module_exports.patch +++ b/target/linux/generic/hack-4.14/221-module_exports.patch @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau #include /* Align . to a 8 byte boundary equals to maximum function alignment. */ -@@ -341,14 +351,14 @@ +@@ -342,14 +352,14 @@ /* Kernel symbol table: Normal symbols */ \ __ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start___ksymtab) = .; \ @@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .; \ } \ \ -@@ -410,7 +420,7 @@ +@@ -411,7 +421,7 @@ \ /* Kernel symbol table: strings */ \ __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \ @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau } \ \ /* __*init sections */ \ -@@ -793,6 +803,8 @@ +@@ -796,6 +806,8 @@ EXIT_TEXT \ EXIT_DATA \ EXIT_CALL \ diff --git a/target/linux/generic/pending-4.14/810-pci_disable_common_quirks.patch b/target/linux/generic/pending-4.14/810-pci_disable_common_quirks.patch index 718b8addd4..1d10af647f 100644 --- a/target/linux/generic/pending-4.14/810-pci_disable_common_quirks.patch +++ b/target/linux/generic/pending-4.14/810-pci_disable_common_quirks.patch @@ -32,7 +32,7 @@ Signed-off-by: Gabor Juhos /* The Mellanox Tavor device gives false positive parity errors * Mark this device with a broken_parity_status, to allow * PCI scanning code to "skip" this now blacklisted device. -@@ -3095,6 +3096,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I +@@ -3108,6 +3109,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata); @@ -40,7 +40,7 @@ Signed-off-by: Gabor Juhos /* * Ivytown NTB BAR sizes are misreported by the hardware due to an erratum. To -@@ -3151,6 +3153,8 @@ static void fixup_debug_report(struct pc +@@ -3164,6 +3166,8 @@ static void fixup_debug_report(struct pc } } @@ -49,7 +49,7 @@ Signed-off-by: Gabor Juhos /* * Some BIOS implementations leave the Intel GPU interrupts enabled, * even though no one is handling them (f.e. i915 driver is never loaded). -@@ -3189,6 +3193,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN +@@ -3202,6 +3206,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq); diff --git a/target/linux/mvebu/patches-4.14/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch b/target/linux/mvebu/patches-4.14/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch index 74e78d3b54..beea6a55ba 100644 --- a/target/linux/mvebu/patches-4.14/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch +++ b/target/linux/mvebu/patches-4.14/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch @@ -67,7 +67,7 @@ Signed-off-by: Thomas Petazzoni PCIE_CORE_DEV_CTRL_STATS_SNOOP_DISABLE | (PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SZ << PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE_SHIFT); -@@ -886,6 +889,58 @@ out_release_res: +@@ -882,6 +885,58 @@ out_release_res: return err; } @@ -126,7 +126,7 @@ Signed-off-by: Thomas Petazzoni static int advk_pcie_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; -@@ -960,6 +1015,9 @@ static int advk_pcie_probe(struct platfo +@@ -956,6 +1011,9 @@ static int advk_pcie_probe(struct platfo list_for_each_entry(child, &bus->children, node) pcie_bus_configure_settings(child); -- 2.25.1