| Message ID | 20180916152854.2216-2-foss@volatilesystems.org |
|---|---|
| State | Accepted |
| Delegated to: | Koen Vandeputte |
| Headers | show |
| Series | [OpenWrt-Devel,1/2] kernel: bump 4.9 to 4.9.127 for 18.06 | expand |
On 16-09-18 17:28, Stijn Segers wrote: > Refreshes patches and bumps 4.14 kernel to 4.14.70 for OpenWrt 18.06. > > Compile-tested on ramips/mt7621, x86/64. > Run-tested on ramips/mt7621, x86/64. > > Signed-off-by: Stijn Segers <foss@volatilesystems.org> > --- > Hi Stijn, Thanks for the patch. I've notified Richard Weinberger of a bug within ubifs since kernel 4.14.69 This patch needs to incorporate the revert of that buggy commit [1] or it will kill all targets using ubifs. I'm guessing Richard will just revert the commit, based on his reply a few hours ago, but let's wait a bit to see if that will actually be the official case. Regards, Koen [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v4.14.70&id=8a23348d76a1e7716da6e76383281ac82fc071cf
On 2018-09-16 23:05, Koen Vandeputte wrote: > > > On 16-09-18 17:28, Stijn Segers wrote: >> Refreshes patches and bumps 4.14 kernel to 4.14.70 for OpenWrt 18.06. >> >> Compile-tested on ramips/mt7621, x86/64. >> Run-tested on ramips/mt7621, x86/64. >> >> Signed-off-by: Stijn Segers <foss@volatilesystems.org> >> --- >> > Hi Stijn, > > Thanks for the patch. > > I've notified Richard Weinberger of a bug within ubifs since kernel > 4.14.69 > > This patch needs to incorporate the revert of that buggy commit [1] > or it will kill all targets using ubifs. > > I'm guessing Richard will just revert the commit, based on his reply a > few hours ago, but let's wait a bit to see if that will actually be > the official case. > > > Regards, > > Koen > > [1] > https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v4.14.70&id=8a23348d76a1e7716da6e76383281ac82fc071cf Hi Stijn, The patch introducing the issue got reverted officially. [1] I've updated your patch with a backport of the fix. Thanks, Koen [1] https://lore.kernel.org/patchwork/patch/986563/
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 50aed02c4a..4c35b124a4 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -3,10 +3,10 @@ LINUX_RELEASE?=1 LINUX_VERSION-4.9 = .127 -LINUX_VERSION-4.14 = .68 +LINUX_VERSION-4.14 = .70 LINUX_KERNEL_HASH-4.9.127 = 9477aeaded97589a40d7cbbfeebfa7a8f863130c0729a8dc5cdbcf48eb6fdd0f -LINUX_KERNEL_HASH-4.14.68 = 791dbf1597033bf2b61e83307d78188ffc1ad4bdd1da3234876667edfdd28690 +LINUX_KERNEL_HASH-4.14.70 = c5dfd832477f8856b5b094ab62cc8c8491d04b76b2ec5ebb0126e554891ee32c remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch b/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch index 9d6ce98080..5aae823ed7 100644 --- a/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch +++ b/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch @@ -90,7 +90,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> expired_count++; --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c -@@ -1105,6 +1105,14 @@ static const struct nla_policy ct_nla_po +@@ -1120,6 +1120,14 @@ static const struct nla_policy ct_nla_po .len = NF_CT_LABELS_MAX_SIZE }, }; @@ -105,7 +105,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> static int ctnetlink_flush_conntrack(struct net *net, const struct nlattr * const cda[], u32 portid, int report) -@@ -1117,7 +1125,7 @@ static int ctnetlink_flush_conntrack(str +@@ -1132,7 +1140,7 @@ static int ctnetlink_flush_conntrack(str return PTR_ERR(filter); } @@ -114,7 +114,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> portid, report); kfree(filter); -@@ -1163,6 +1171,11 @@ static int ctnetlink_del_conntrack(struc +@@ -1178,6 +1186,11 @@ static int ctnetlink_del_conntrack(struc ct = nf_ct_tuplehash_to_ctrack(h); diff --git a/target/linux/ramips/patches-4.14/0051-serial-add-ugly-custom-baud-rate-hack.patch b/target/linux/ramips/patches-4.14/0051-serial-add-ugly-custom-baud-rate-hack.patch index b71d8f38e0..634033d18d 100644 --- a/target/linux/ramips/patches-4.14/0051-serial-add-ugly-custom-baud-rate-hack.patch +++ b/target/linux/ramips/patches-4.14/0051-serial-add-ugly-custom-baud-rate-hack.patch @@ -10,7 +10,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c -@@ -411,6 +411,9 @@ uart_get_baud_rate(struct uart_port *por +@@ -418,6 +418,9 @@ uart_get_baud_rate(struct uart_port *por break; }
Refreshes patches and bumps 4.14 kernel to 4.14.70 for OpenWrt 18.06. Compile-tested on ramips/mt7621, x86/64. Run-tested on ramips/mt7621, x86/64. Signed-off-by: Stijn Segers <foss@volatilesystems.org> --- include/kernel-version.mk | 4 ++-- ...20-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch | 6 +++--- .../patches-4.14/0051-serial-add-ugly-custom-baud-rate-hack.patch | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)