aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-4.14/901-debloat_sock_diag.patch
diff options
context:
space:
mode:
authorStijn Segers <foss@volatilesystems.org>2018-02-28 22:53:37 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2018-03-02 21:33:08 +0100
commitb5469b38cd68342db0a4c476aec9ad7a0c164027 (patch)
tree62fe543196f822f4d396c335aa6ca4b5c590c187 /target/linux/generic/hack-4.14/901-debloat_sock_diag.patch
parent844bdf94e42e967e35b71212cb9261fcb35e6aae (diff)
downloadupstream-b5469b38cd68342db0a4c476aec9ad7a0c164027.tar.gz
upstream-b5469b38cd68342db0a4c476aec9ad7a0c164027.tar.bz2
upstream-b5469b38cd68342db0a4c476aec9ad7a0c164027.zip
kernel: bump 4.14 to 4.14.23
This patch bumps the 4.14 kernel to .23. - Refreshed patches. - Deleted bcm53xx/patches-4.14/089-PCI-iproc-Fix-NULL-pointer-dereference-for-BCMA.patch. Has been accepted upstream. - Deleted generic/pending-4.14/821-usb-Remove-annoying-warning-about-bogus-URB.patch. The upstream URB code was changed, the patch no longer applies. I discussed this with the patch author and removed it for now, we'll see how it goes. Compile-tested on: ramips/mt7621, x86/64 Run-tested on: ramips/mt7621, x86/64 Signed-off-by: Stijn Segers <foss@volatilesystems.org>
Diffstat (limited to 'target/linux/generic/hack-4.14/901-debloat_sock_diag.patch')
-rw-r--r--target/linux/generic/hack-4.14/901-debloat_sock_diag.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/hack-4.14/901-debloat_sock_diag.patch b/target/linux/generic/hack-4.14/901-debloat_sock_diag.patch
index d854865d60..29071d63c9 100644
--- a/target/linux/generic/hack-4.14/901-debloat_sock_diag.patch
+++ b/target/linux/generic/hack-4.14/901-debloat_sock_diag.patch
@@ -61,7 +61,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie)
{
struct dst_entry *dst = __sk_dst_get(sk);
-@@ -1597,9 +1609,11 @@ void sk_destruct(struct sock *sk)
+@@ -1595,9 +1607,11 @@ void sk_destruct(struct sock *sk)
static void __sk_free(struct sock *sk)
{