Skip to content

Commit

Permalink
kernel: bump to 4.9.180, 4.14.123, 4.19.48
Browse files Browse the repository at this point in the history
  • Loading branch information
coolsnowwolf committed Jun 11, 2019
1 parent c7c9617 commit 129f567
Show file tree
Hide file tree
Showing 35 changed files with 65 additions and 255 deletions.
12 changes: 6 additions & 6 deletions include/kernel-version.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif

LINUX_VERSION-4.9 = .178
LINUX_VERSION-4.14 = .121
LINUX_VERSION-4.19 = .45
LINUX_VERSION-4.9 = .180
LINUX_VERSION-4.14 = .123
LINUX_VERSION-4.19 = .48

LINUX_KERNEL_HASH-4.9.178 = 13ffd8b0725d9ce9f9e927f4748ef640b049d7c69f21b28ca0d976cc23072566
LINUX_KERNEL_HASH-4.14.121 = 2eecd6825a0998c8b6dd686cd4cd76e9f0d195bbace89f0b82495cc11ddb2884
LINUX_KERNEL_HASH-4.19.45 = eb31e62fbb30aaeedb892cecdd8ac9746d42cbbef2ef2356f9ca8e13514b9d2b
LINUX_KERNEL_HASH-4.9.180 = d25a490d62a3e96a587333e163862585eac4086fc8d4893b4ec1711e7d387c5f
LINUX_KERNEL_HASH-4.14.123 = 25f58cb56bde388ac9bcee984f5f2d0ca094b0a8af6b92ad1f5b2fd0e6725b85
LINUX_KERNEL_HASH-4.19.48 = 01d0db4f10cc8e384241a605e29413e32c442aa6853c116877538b07c16893fa

remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -135,6 +135,7 @@ obj-$(CONFIG_XZ_DEC) += xz/
@@ -146,6 +146,7 @@ obj-$(CONFIG_XZ_DEC) += xz/
obj-$(CONFIG_RAID6_PQ) += raid6/
obj-$(CONFIG_LZMA_COMPRESS) += lzma/
obj-$(CONFIG_LZMA_DECOMPRESS) += lzma/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <[email protected]>

--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -5162,6 +5162,8 @@ int __init cgroup_init_early(void)
@@ -5168,6 +5168,8 @@ int __init cgroup_init_early(void)
}

static u16 cgroup_disable_mask __initdata;
Expand All @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <[email protected]>

/**
* cgroup_init - cgroup initialization
@@ -5200,6 +5202,12 @@ int __init cgroup_init(void)
@@ -5206,6 +5208,12 @@ int __init cgroup_init(void)

mutex_unlock(&cgroup_mutex);

Expand All @@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <[email protected]>
for_each_subsys(ss, ssid) {
if (ss->early_init) {
struct cgroup_subsys_state *css =
@@ -5583,6 +5591,28 @@ static int __init cgroup_disable(char *s
@@ -5589,6 +5597,28 @@ static int __init cgroup_disable(char *s
}
__setup("cgroup_disable=", cgroup_disable);

Expand Down
2 changes: 1 addition & 1 deletion target/linux/cns3xxx/patches-4.14/075-spi_support.patch
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
/**
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1027,6 +1027,9 @@ static int spi_transfer_one_message(stru
@@ -1029,6 +1029,9 @@ static int spi_transfer_one_message(stru
list_for_each_entry(xfer, &msg->transfers, transfer_list) {
trace_spi_transfer_start(msg, xfer);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
/* For Max performance, the MRRS must be set to the largest supported
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -845,7 +845,7 @@ enum pcie_bus_config_types {
@@ -847,7 +847,7 @@ enum pcie_bus_config_types {
PCIE_BUS_DEFAULT, /* ensure MPS matches upstream bridge */
PCIE_BUS_SAFE, /* use largest MPS boot-time devices support */
PCIE_BUS_PERFORMANCE, /* use MPS and MRRS for best performance */
Expand Down
2 changes: 1 addition & 1 deletion target/linux/cns3xxx/patches-4.19/075-spi_support.patch
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
/**
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1018,6 +1018,9 @@ static int spi_transfer_one_message(stru
@@ -1020,6 +1020,9 @@ static int spi_transfer_one_message(stru
list_for_each_entry(xfer, &msg->transfers, transfer_list) {
trace_spi_transfer_start(msg, xfer);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -2629,7 +2629,8 @@ static void pcie_write_mrrs(struct pci_d
@@ -2634,7 +2634,8 @@ static void pcie_write_mrrs(struct pci_d
* In the "safe" case, do not configure the MRRS. There appear to be
* issues with setting MRRS to 0 on a number of devices.
*/
Expand All @@ -12,7 +12,7 @@
/*
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -866,7 +866,7 @@ enum pcie_bus_config_types {
@@ -868,7 +868,7 @@ enum pcie_bus_config_types {
PCIE_BUS_DEFAULT, /* Ensure MPS matches upstream bridge */
PCIE_BUS_SAFE, /* Use largest MPS boot-time devices support */
PCIE_BUS_PERFORMANCE, /* Use MPS and MRRS for best performance */
Expand Down
4 changes: 2 additions & 2 deletions target/linux/generic/hack-4.14/721-phy_packets.patch
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2512,6 +2512,10 @@ static inline int pskb_trim(struct sk_bu
@@ -2514,6 +2514,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}

Expand All @@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
/**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter
@@ -2642,16 +2646,6 @@ static inline struct sk_buff *dev_alloc_
@@ -2645,16 +2649,6 @@ static inline struct sk_buff *dev_alloc_
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
#endif /* _KOBJECT_H_ */
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -599,6 +599,43 @@ int add_uevent_var(struct kobj_uevent_en
@@ -602,6 +602,43 @@ int add_uevent_var(struct kobj_uevent_en
EXPORT_SYMBOL_GPL(add_uevent_var);

#if defined(CONFIG_NET)
Expand Down
6 changes: 3 additions & 3 deletions target/linux/generic/hack-4.19/204-module_strip.patch
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau <[email protected]>

--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1994,6 +1994,13 @@ config TRIM_UNUSED_KSYMS
@@ -1997,6 +1997,13 @@ config TRIM_UNUSED_KSYMS

If unsure, or if you need to build out-of-tree modules, say N.

Expand All @@ -114,7 +114,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
config MODULES_TREE_LOOKUP
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -3004,9 +3004,11 @@ static int setup_load_info(struct load_i
@@ -3009,9 +3009,11 @@ static int setup_load_info(struct load_i

static int check_modinfo(struct module *mod, struct load_info *info, int flags)
{
Expand All @@ -127,7 +127,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
if (flags & MODULE_INIT_IGNORE_VERMAGIC)
modmagic = NULL;

@@ -3027,6 +3029,7 @@ static int check_modinfo(struct module *
@@ -3032,6 +3034,7 @@ static int check_modinfo(struct module *
mod->name);
add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
}
Expand Down
4 changes: 2 additions & 2 deletions target/linux/generic/hack-4.19/207-disable-modorder.patch
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ Signed-off-by: Felix Fietkau <[email protected]>

--- a/Makefile
+++ b/Makefile
@@ -1231,7 +1231,6 @@ all: modules
@@ -1224,7 +1224,6 @@ all: modules

PHONY += modules
modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
- $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
@$(kecho) ' Building modules, stage 2.';
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost

@@ -1260,7 +1259,6 @@ _modinst_:
@@ -1253,7 +1252,6 @@ _modinst_:
rm -f $(MODLIB)/build ; \
ln -s $(CURDIR) $(MODLIB)/build ; \
fi
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-4.19/220-gc_sections.patch
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
# Read KERNELRELEASE from include/config/kernel.release (if it exists)
KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
@@ -787,11 +792,6 @@ ifdef CONFIG_DEBUG_SECTION_MISMATCH
@@ -780,11 +785,6 @@ ifdef CONFIG_DEBUG_SECTION_MISMATCH
KBUILD_CFLAGS += $(call cc-option, -fno-inline-functions-called-once)
endif

Expand Down
4 changes: 2 additions & 2 deletions target/linux/generic/hack-4.19/721-phy_packets.patch
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2527,6 +2527,10 @@ static inline int pskb_trim(struct sk_bu
@@ -2529,6 +2529,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}

Expand All @@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
/**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter
@@ -2657,16 +2661,6 @@ static inline struct sk_buff *dev_alloc_
@@ -2660,16 +2664,6 @@ static inline struct sk_buff *dev_alloc_
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
#endif /* _KOBJECT_H_ */
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -685,6 +685,43 @@ int add_uevent_var(struct kobj_uevent_en
@@ -688,6 +688,43 @@ int add_uevent_var(struct kobj_uevent_en
EXPORT_SYMBOL_GPL(add_uevent_var);

#if defined(CONFIG_NET)
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-4.19/930-crashlog.patch
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
+#endif
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1046,6 +1046,10 @@ config RELAY
@@ -1049,6 +1049,10 @@ config RELAY

If unsure, say N.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1119,7 +1119,7 @@ Signed-off-by: Alexandros C. Couloumbis <[email protected]>
ifdef CONFIG_FUNCTION_TRACER
ORIG_CFLAGS := $(KBUILD_CFLAGS)
KBUILD_CFLAGS = $(subst $(CC_FLAGS_FTRACE),,$(ORIG_CFLAGS))
@@ -123,6 +133,8 @@ obj-$(CONFIG_ZSTD_COMPRESS) += zstd/
@@ -134,6 +144,8 @@ obj-$(CONFIG_ZSTD_COMPRESS) += zstd/
obj-$(CONFIG_ZSTD_DECOMPRESS) += zstd/
obj-$(CONFIG_XZ_DEC) += xz/
obj-$(CONFIG_RAID6_PQ) += raid6/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <[email protected]>

--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2476,7 +2476,7 @@ static inline int pskb_network_may_pull(
@@ -2478,7 +2478,7 @@ static inline int pskb_network_may_pull(
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
*/
#ifndef NET_SKB_PAD
Expand Down
95 changes: 0 additions & 95 deletions target/linux/generic/pending-4.14/701-phy_extension.patch

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ Signed-off-by: Gabor Juhos <[email protected]>
/* 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.
@@ -3077,6 +3078,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
@@ -3094,6 +3095,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);

+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */

/*
* Ivytown NTB BAR sizes are misreported by the hardware due to an erratum. To
@@ -3133,6 +3135,8 @@ static void fixup_debug_report(struct pc
@@ -3150,6 +3152,8 @@ static void fixup_debug_report(struct pc
}
}

Expand All @@ -49,7 +49,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
/*
* Some BIOS implementations leave the Intel GPU interrupts enabled,
* even though no one is handling them (f.e. i915 driver is never loaded).
@@ -3171,6 +3175,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
@@ -3188,6 +3192,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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <[email protected]>

--- a/Makefile
+++ b/Makefile
@@ -661,12 +661,12 @@ KBUILD_CFLAGS += $(call cc-disable-warni
@@ -654,12 +654,12 @@ KBUILD_CFLAGS += $(call cc-disable-warni
KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context)

ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <[email protected]>

--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1146,6 +1146,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
@@ -1149,6 +1149,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
the unaligned access emulation.
see arch/parisc/kernel/unaligned.c for reference

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@ -260,8 +260,7 @@ struct ftrace_likely_data {
@@ -264,8 +264,7 @@ struct ftrace_likely_data {
* of extern inline functions at link time.
* A lot of inline functions can cause havoc with function tracing.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1119,7 +1119,7 @@ Signed-off-by: Alexandros C. Couloumbis <[email protected]>
ifdef CONFIG_FUNCTION_TRACER
ORIG_CFLAGS := $(KBUILD_CFLAGS)
KBUILD_CFLAGS = $(subst $(CC_FLAGS_FTRACE),,$(ORIG_CFLAGS))
@@ -128,6 +138,8 @@ obj-$(CONFIG_ZSTD_COMPRESS) += zstd/
@@ -139,6 +149,8 @@ obj-$(CONFIG_ZSTD_COMPRESS) += zstd/
obj-$(CONFIG_ZSTD_DECOMPRESS) += zstd/
obj-$(CONFIG_XZ_DEC) += xz/
obj-$(CONFIG_RAID6_PQ) += raid6/
Expand Down
Loading

0 comments on commit 129f567

Please sign in to comment.