From 92b8fe0e0e2027ec2b53a596dc0c1398583796b9 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 24 Jun 2019 13:39:12 +0200 Subject: [PATCH] kernel: bump 4.19 to 4.19.55 Refreshed all patches. Compile-tested on: imx6 Runtime-tested on: imx6 Signed-off-by: Koen Vandeputte --- include/kernel-version.mk | 4 ++-- ...et-sched-Introduce-act_ctinfo-action.patch | 20 ------------------- ...00-MIPS-fix-build-on-non-linux-hosts.patch | 11 ++-------- ...-call-mac_config-during-resolve-when.patch | 4 ++-- ...ink-ensure-inband-AN-works-correctly.patch | 2 +- ...etdev-sfp_bus-and-use-for-start-stop.patch | 4 ++-- 6 files changed, 9 insertions(+), 36 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index a1ef72c170..4451802537 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,11 +8,11 @@ endif LINUX_VERSION-4.9 = .183 LINUX_VERSION-4.14 = .129 -LINUX_VERSION-4.19 = .53 +LINUX_VERSION-4.19 = .55 LINUX_KERNEL_HASH-4.9.183 = fd57b0991cdbf4e2e933c260356a4768d6685a77460684f8de36a59fd42867f3 LINUX_KERNEL_HASH-4.14.129 = 7548482b03aea1784e728e4d29fe75a2abc61c9dbf9851ec925a7fbecf9336e4 -LINUX_KERNEL_HASH-4.19.53 = e647730b7eafac70c3bd7abed4e6ed5a09eb794c645fcb0c62a79f62edbdeb02 +LINUX_KERNEL_HASH-4.19.55 = c906f0cba7998c5942aaf7034ef8ea925f04f47a673816da05b203e97360b947 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.19/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch b/target/linux/generic/backport-4.19/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch index 1d8694f6f8..d0047435fd 100644 --- a/target/linux/generic/backport-4.19/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch +++ b/target/linux/generic/backport-4.19/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch @@ -71,9 +71,6 @@ Signed-off-by: Kevin Darbyshire-Bryant create mode 100644 include/uapi/linux/tc_act/tc_ctinfo.h create mode 100644 net/sched/act_ctinfo.c -diff --git a/include/net/tc_act/tc_ctinfo.h b/include/net/tc_act/tc_ctinfo.h -new file mode 100644 -index 000000000000..f071c1d70a25 --- /dev/null +++ b/include/net/tc_act/tc_ctinfo.h @@ -0,0 +1,33 @@ @@ -110,8 +107,6 @@ index 000000000000..f071c1d70a25 +#define to_ctinfo(a) ((struct tcf_ctinfo *)a) + +#endif /* __NET_TC_CTINFO_H */ -diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h -index be382fb0592d..71e10c5a96a0 100644 --- a/include/uapi/linux/pkt_cls.h +++ b/include/uapi/linux/pkt_cls.h @@ -68,7 +68,8 @@ enum { @@ -124,9 +119,6 @@ index be382fb0592d..71e10c5a96a0 100644 }; #define TCA_ID_MAX __TCA_ID_MAX -diff --git a/include/uapi/linux/tc_act/tc_ctinfo.h b/include/uapi/linux/tc_act/tc_ctinfo.h -new file mode 100644 -index 000000000000..f5f26d95d0e7 --- /dev/null +++ b/include/uapi/linux/tc_act/tc_ctinfo.h @@ -0,0 +1,29 @@ @@ -159,8 +151,6 @@ index 000000000000..f5f26d95d0e7 +#define TCA_CTINFO_MAX (__TCA_CTINFO_MAX - 1) + +#endif -diff --git a/net/sched/Kconfig b/net/sched/Kconfig -index e95741388311..1d79d5dba6e4 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig @@ -866,6 +866,23 @@ config NET_ACT_CONNMARK @@ -187,8 +177,6 @@ index e95741388311..1d79d5dba6e4 100644 config NET_ACT_SKBMOD tristate "skb data modification action" depends on NET_CLS_ACT -diff --git a/net/sched/Makefile b/net/sched/Makefile -index f0403f49edcb..bb3c2bc44af7 100644 --- a/net/sched/Makefile +++ b/net/sched/Makefile @@ -21,6 +21,7 @@ obj-$(CONFIG_NET_ACT_CSUM) += act_csum.o @@ -199,9 +187,6 @@ index f0403f49edcb..bb3c2bc44af7 100644 obj-$(CONFIG_NET_ACT_SKBMOD) += act_skbmod.o obj-$(CONFIG_NET_ACT_IFE) += act_ife.o obj-$(CONFIG_NET_IFE_SKBMARK) += act_meta_mark.o -diff --git a/net/sched/act_ctinfo.c b/net/sched/act_ctinfo.c -new file mode 100644 -index 000000000000..8975cb4976aa --- /dev/null +++ b/net/sched/act_ctinfo.c @@ -0,0 +1,395 @@ @@ -600,8 +585,6 @@ index 000000000000..8975cb4976aa +MODULE_AUTHOR("Kevin Darbyshire-Bryant "); +MODULE_DESCRIPTION("Connection tracking mark actions"); +MODULE_LICENSE("GPL"); -diff --git a/tools/testing/selftests/tc-testing/config b/tools/testing/selftests/tc-testing/config -index 203302065458..9d1fddcfb887 100644 --- a/tools/testing/selftests/tc-testing/config +++ b/tools/testing/selftests/tc-testing/config @@ -37,6 +37,7 @@ CONFIG_NET_ACT_SKBEDIT=m @@ -612,6 +595,3 @@ index 203302065458..9d1fddcfb887 100644 CONFIG_NET_ACT_CONNMARK=m CONFIG_NET_ACT_SKBMOD=m CONFIG_NET_ACT_IFE=m --- -2.20.1 (Apple Git-117) - diff --git a/target/linux/generic/pending-4.19/100-MIPS-fix-build-on-non-linux-hosts.patch b/target/linux/generic/pending-4.19/100-MIPS-fix-build-on-non-linux-hosts.patch index 7204a7176c..5d34df4283 100644 --- a/target/linux/generic/pending-4.19/100-MIPS-fix-build-on-non-linux-hosts.patch +++ b/target/linux/generic/pending-4.19/100-MIPS-fix-build-on-non-linux-hosts.patch @@ -31,11 +31,9 @@ Signed-off-by: Kevin Darbyshire-Bryant arch/mips/boot/compressed/calc_vmlinuz_load_addr.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) -diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile -index 3c453a1f1ff1..172801ed35b8 100644 --- a/arch/mips/boot/compressed/Makefile +++ b/arch/mips/boot/compressed/Makefile -@@ -78,6 +78,8 @@ OBJCOPYFLAGS_piggy.o := --add-section=.image=$(obj)/vmlinux.bin.z \ +@@ -78,6 +78,8 @@ OBJCOPYFLAGS_piggy.o := --add-section=.i $(obj)/piggy.o: $(obj)/dummy.o $(obj)/vmlinux.bin.z FORCE $(call if_changed,objcopy) @@ -44,11 +42,9 @@ index 3c453a1f1ff1..172801ed35b8 100644 # Calculate the load address of the compressed kernel image hostprogs-y := calc_vmlinuz_load_addr -diff --git a/arch/mips/boot/compressed/calc_vmlinuz_load_addr.c b/arch/mips/boot/compressed/calc_vmlinuz_load_addr.c -index 240f1d12df75..080b926d2623 100644 --- a/arch/mips/boot/compressed/calc_vmlinuz_load_addr.c +++ b/arch/mips/boot/compressed/calc_vmlinuz_load_addr.c -@@ -9,7 +9,7 @@ +@@ -13,7 +13,7 @@ #include #include #include @@ -57,6 +53,3 @@ index 240f1d12df75..080b926d2623 100644 int main(int argc, char *argv[]) { --- -2.20.1 (Apple Git-117) - diff --git a/target/linux/mvebu/patches-4.19/402-net-phylink-only-call-mac_config-during-resolve-when.patch b/target/linux/mvebu/patches-4.19/402-net-phylink-only-call-mac_config-during-resolve-when.patch index 0dc2605077..611999baea 100644 --- a/target/linux/mvebu/patches-4.19/402-net-phylink-only-call-mac_config-during-resolve-when.patch +++ b/target/linux/mvebu/patches-4.19/402-net-phylink-only-call-mac_config-during-resolve-when.patch @@ -13,7 +13,7 @@ Signed-off-by: Russell King --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c -@@ -333,6 +333,13 @@ static void phylink_mac_config(struct ph +@@ -337,6 +337,13 @@ static void phylink_mac_config(struct ph pl->ops->mac_config(pl->netdev, pl->link_an_mode, state); } @@ -27,7 +27,7 @@ Signed-off-by: Russell King static void phylink_mac_an_restart(struct phylink *pl) { if (pl->link_config.an_enabled && -@@ -436,12 +443,12 @@ static void phylink_resolve(struct work_ +@@ -440,12 +447,12 @@ static void phylink_resolve(struct work_ case MLO_AN_PHY: link_state = pl->phy_state; phylink_resolve_flow(pl, &link_state); diff --git a/target/linux/mvebu/patches-4.19/403-net-phylink-ensure-inband-AN-works-correctly.patch b/target/linux/mvebu/patches-4.19/403-net-phylink-ensure-inband-AN-works-correctly.patch index 63f2113100..a0cdf838b2 100644 --- a/target/linux/mvebu/patches-4.19/403-net-phylink-ensure-inband-AN-works-correctly.patch +++ b/target/linux/mvebu/patches-4.19/403-net-phylink-ensure-inband-AN-works-correctly.patch @@ -16,7 +16,7 @@ Signed-off-by: Russell King --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c -@@ -453,28 +453,21 @@ static void phylink_resolve(struct work_ +@@ -457,28 +457,21 @@ static void phylink_resolve(struct work_ case MLO_AN_INBAND: phylink_get_mac_state(pl, &link_state); diff --git a/target/linux/mvebu/patches-4.19/404-sfp-provide-netdev-sfp_bus-and-use-for-start-stop.patch b/target/linux/mvebu/patches-4.19/404-sfp-provide-netdev-sfp_bus-and-use-for-start-stop.patch index bd8f64dcbe..e174ad0084 100644 --- a/target/linux/mvebu/patches-4.19/404-sfp-provide-netdev-sfp_bus-and-use-for-start-stop.patch +++ b/target/linux/mvebu/patches-4.19/404-sfp-provide-netdev-sfp_bus-and-use-for-start-stop.patch @@ -15,7 +15,7 @@ Signed-off-by: Russell King --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c -@@ -943,8 +943,8 @@ void phylink_start(struct phylink *pl) +@@ -947,8 +947,8 @@ void phylink_start(struct phylink *pl) if (pl->link_an_mode == MLO_AN_FIXED && !IS_ERR(pl->link_gpio)) mod_timer(&pl->link_poll, jiffies + HZ); @@ -26,7 +26,7 @@ Signed-off-by: Russell King if (pl->phydev) phy_start(pl->phydev); } -@@ -965,8 +965,8 @@ void phylink_stop(struct phylink *pl) +@@ -969,8 +969,8 @@ void phylink_stop(struct phylink *pl) if (pl->phydev) phy_stop(pl->phydev); -- 2.30.2