diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-16 13:26:23 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-27 10:32:44 +0200 |
| commit | 491eaa898bc10b2f22c4b9b8d9cea4b860a0587f (patch) | |
| tree | cc9a8182c368eedb48e764c8c7a9d70ff21652f5 /target | |
| parent | 5f013de786da7e7b28445927b538e9c7bf7f768a (diff) | |
| download | upstream-491eaa898bc10b2f22c4b9b8d9cea4b860a0587f.tar.gz upstream-491eaa898bc10b2f22c4b9b8d9cea4b860a0587f.tar.bz2 upstream-491eaa898bc10b2f22c4b9b8d9cea4b860a0587f.zip | |
kernel: bump 4.19 to 4.19.67
Refreshed all patches.
Also add a missing symbol for x86 which got used now in this bump.
- ISCSI_IBFT
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/generic/hack-4.19/902-debloat_proc.patch | 2 | ||||
| -rw-r--r-- | target/linux/generic/pending-4.19/613-netfilter_optional_tcp_window_check.patch | 6 | ||||
| -rw-r--r-- | target/linux/x86/64/config-4.19 | 1 | ||||
| -rw-r--r-- | target/linux/x86/generic/config-4.19 | 1 | ||||
| -rw-r--r-- | target/linux/x86/geode/config-4.19 | 1 | ||||
| -rw-r--r-- | target/linux/x86/legacy/config-4.19 | 1 |
6 files changed, 8 insertions, 4 deletions
diff --git a/target/linux/generic/hack-4.19/902-debloat_proc.patch b/target/linux/generic/hack-4.19/902-debloat_proc.patch index a396ad0d12..e70f030cb8 100644 --- a/target/linux/generic/hack-4.19/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.19/902-debloat_proc.patch @@ -232,7 +232,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (!pe) --- a/mm/vmalloc.c +++ b/mm/vmalloc.c -@@ -2740,6 +2740,8 @@ static const struct seq_operations vmall +@@ -2749,6 +2749,8 @@ static const struct seq_operations vmall static int __init proc_vmalloc_init(void) { diff --git a/target/linux/generic/pending-4.19/613-netfilter_optional_tcp_window_check.patch b/target/linux/generic/pending-4.19/613-netfilter_optional_tcp_window_check.patch index 2bc48f87cf..634218dfc3 100644 --- a/target/linux/generic/pending-4.19/613-netfilter_optional_tcp_window_check.patch +++ b/target/linux/generic/pending-4.19/613-netfilter_optional_tcp_window_check.patch @@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /* "Be conservative in what you do, be liberal in what you accept from others." If it's non-zero, we mark only out of window RST segments as INVALID. */ -@@ -483,6 +486,9 @@ static bool tcp_in_window(const struct n +@@ -484,6 +487,9 @@ static bool tcp_in_window(const struct n s32 receiver_offset; bool res, in_recv_win; @@ -28,7 +28,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /* * Get the required data from the packet. */ -@@ -1057,7 +1063,7 @@ static int tcp_packet(struct nf_conn *ct +@@ -1059,7 +1065,7 @@ static int tcp_packet(struct nf_conn *ct IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED && timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK]) timeout = timeouts[TCP_CONNTRACK_UNACK]; @@ -37,7 +37,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS]) timeout = timeouts[TCP_CONNTRACK_RETRANS]; else -@@ -1506,6 +1512,13 @@ static struct ctl_table tcp_sysctl_table +@@ -1508,6 +1514,13 @@ static struct ctl_table tcp_sysctl_table .mode = 0644, .proc_handler = proc_dointvec, }, diff --git a/target/linux/x86/64/config-4.19 b/target/linux/x86/64/config-4.19 index 43642e5a66..ddbd818dfc 100644 --- a/target/linux/x86/64/config-4.19 +++ b/target/linux/x86/64/config-4.19 @@ -292,6 +292,7 @@ CONFIG_INTEL_SOC_DTS_THERMAL=y CONFIG_IOMMU_HELPER=y CONFIG_IOSF_MBI=y # CONFIG_IOSF_MBI_DEBUG is not set +# CONFIG_ISCSI_IBFT is not set # CONFIG_ISCSI_IBFT_FIND is not set CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y # CONFIG_KVM_DEBUG_FS is not set diff --git a/target/linux/x86/generic/config-4.19 b/target/linux/x86/generic/config-4.19 index e769835b73..4a689ca026 100644 --- a/target/linux/x86/generic/config-4.19 +++ b/target/linux/x86/generic/config-4.19 @@ -231,6 +231,7 @@ CONFIG_IRQ_BYPASS_MANAGER=y CONFIG_ISA=y CONFIG_ISAPNP=y CONFIG_ISA_BUS_API=y +# CONFIG_ISCSI_IBFT is not set # CONFIG_ISCSI_IBFT_FIND is not set CONFIG_ISO9660_FS=y # CONFIG_JOLIET is not set diff --git a/target/linux/x86/geode/config-4.19 b/target/linux/x86/geode/config-4.19 index 9ee50f89f5..5b01ecf00a 100644 --- a/target/linux/x86/geode/config-4.19 +++ b/target/linux/x86/geode/config-4.19 @@ -68,6 +68,7 @@ CONFIG_IOSF_MBI=y CONFIG_ISA=y # CONFIG_ISAPNP is not set CONFIG_ISA_BUS_API=y +# CONFIG_ISCSI_IBFT is not set # CONFIG_ISCSI_IBFT_FIND is not set # CONFIG_LANCE is not set CONFIG_LEDS_GPIO=y diff --git a/target/linux/x86/legacy/config-4.19 b/target/linux/x86/legacy/config-4.19 index 4fcbc05aef..2e5199185a 100644 --- a/target/linux/x86/legacy/config-4.19 +++ b/target/linux/x86/legacy/config-4.19 @@ -143,6 +143,7 @@ CONFIG_IOSF_MBI=y CONFIG_ISA=y CONFIG_ISAPNP=y CONFIG_ISA_BUS_API=y +# CONFIG_ISCSI_IBFT is not set # CONFIG_ISCSI_IBFT_FIND is not set CONFIG_ISO9660_FS=y # CONFIG_JOLIET is not set |