From: Greg Kroah-Hartman Date: Fri, 6 Apr 2018 08:03:04 +0000 (+0200) Subject: 4.15-stable patches X-Git-Tag: v3.18.103~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9dd5246cf79962f978471fa7ce137575c9d9c7b0;p=thirdparty%2Fkernel%2Fstable-queue.git 4.15-stable patches added patches: revert-arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch revert-arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch revert-cpufreq-fix-governor-module-removal-race.patch revert-ip6_vti-adjust-vti-mtu-according-to-mtu-of-lower-device.patch --- diff --git a/queue-4.15/revert-arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch b/queue-4.15/revert-arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch new file mode 100644 index 00000000000..266ec9f7c65 --- /dev/null +++ b/queue-4.15/revert-arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch @@ -0,0 +1,33 @@ +From foo@baz Fri Apr 6 10:01:11 CEST 2018 +From: Greg Kroah-Hartman +Date: Fri, 6 Apr 2018 08:49:19 +0200 +Subject: Revert "ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin" + +From: Greg Kroah-Hartman + +This reverts commit cc578825b46e984c19b4a4630d3191d60ff83642 which was +comit e153db03c6b7a035c797bcdf35262586f003ee93 upstream. + +It requires a driver that was not merged until 4.16, so remove it from +this stable tree as it is pointless. + +Reported-by: Ben Hutchings +Cc: Andrew F. Davis +Cc: Tony Lindgren +Cc: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm/boot/dts/am335x-pepper.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/boot/dts/am335x-pepper.dts ++++ b/arch/arm/boot/dts/am335x-pepper.dts +@@ -139,7 +139,7 @@ + &audio_codec { + status = "okay"; + +- reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; ++ gpio-reset = <&gpio1 16 GPIO_ACTIVE_LOW>; + AVDD-supply = <&ldo3_reg>; + IOVDD-supply = <&ldo3_reg>; + DRVDD-supply = <&ldo3_reg>; diff --git a/queue-4.15/revert-arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch b/queue-4.15/revert-arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch new file mode 100644 index 00000000000..e8bda6fc80a --- /dev/null +++ b/queue-4.15/revert-arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch @@ -0,0 +1,42 @@ +From foo@baz Fri Apr 6 10:01:11 CEST 2018 +From: Greg Kroah-Hartman +Date: Fri, 6 Apr 2018 08:54:26 +0200 +Subject: Revert "ARM: dts: omap3-n900: Fix the audio CODEC's reset pin" + +From: Greg Kroah-Hartman + +This reverts commit c91a501768717f449acd1c2cff1a8531e486c441 which was +commit 7be4b5dc7ffa9499ac6ef33a5ffa9ff43f9b7057 upstream. + +It requires a driver that was not merged until 4.16, so remove it from +this stable tree as it is pointless. + +Reported-by: Ben Hutchings +Cc: Andrew F. Davis +Cc: Tony Lindgren +Cc: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm/boot/dts/omap3-n900.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/arch/arm/boot/dts/omap3-n900.dts ++++ b/arch/arm/boot/dts/omap3-n900.dts +@@ -558,7 +558,7 @@ + tlv320aic3x: tlv320aic3x@18 { + compatible = "ti,tlv320aic3x"; + reg = <0x18>; +- reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; /* 60 */ ++ gpio-reset = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* 60 */ + ai3x-gpio-func = < + 0 /* AIC3X_GPIO1_FUNC_DISABLED */ + 5 /* AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT */ +@@ -575,7 +575,7 @@ + tlv320aic3x_aux: tlv320aic3x@19 { + compatible = "ti,tlv320aic3x"; + reg = <0x19>; +- reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; /* 60 */ ++ gpio-reset = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* 60 */ + + AVDD-supply = <&vmmc2>; + DRVDD-supply = <&vmmc2>; diff --git a/queue-4.15/revert-cpufreq-fix-governor-module-removal-race.patch b/queue-4.15/revert-cpufreq-fix-governor-module-removal-race.patch new file mode 100644 index 00000000000..44873de15f6 --- /dev/null +++ b/queue-4.15/revert-cpufreq-fix-governor-module-removal-race.patch @@ -0,0 +1,43 @@ +From foo@baz Fri Apr 6 10:01:11 CEST 2018 +From: Greg Kroah-Hartman +Date: Fri, 6 Apr 2018 09:06:53 +0200 +Subject: Revert "cpufreq: Fix governor module removal race" + +From: Greg Kroah-Hartman + +This reverts commit a853301f77b5c4feb5e17aebfd92018269525523 which was +commit a8b149d32b663c1a4105273295184b78f53d33cf upstream. + +The backport was not correct, so just drop it entirely. + +Reported-by: Ben Hutchings +Cc: Rafael J. Wysocki +Cc: Viresh Kumar +Cc: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/cpufreq/cpufreq.c | 6 ------ + 1 file changed, 6 deletions(-) + +--- a/drivers/cpufreq/cpufreq.c ++++ b/drivers/cpufreq/cpufreq.c +@@ -637,8 +637,6 @@ static int cpufreq_parse_governor(char * + *governor = t; + err = 0; + } +- if (t && !try_module_get(t->owner)) +- t = NULL; + + mutex_unlock(&cpufreq_governor_mutex); + } +@@ -767,10 +765,6 @@ static ssize_t store_scaling_governor(st + return -EINVAL; + + ret = cpufreq_set_policy(policy, &new_policy); +- +- if (new_policy.governor) +- module_put(new_policy.governor->owner); +- + return ret ? ret : count; + } + diff --git a/queue-4.15/revert-ip6_vti-adjust-vti-mtu-according-to-mtu-of-lower-device.patch b/queue-4.15/revert-ip6_vti-adjust-vti-mtu-according-to-mtu-of-lower-device.patch new file mode 100644 index 00000000000..e3aaa90376c --- /dev/null +++ b/queue-4.15/revert-ip6_vti-adjust-vti-mtu-according-to-mtu-of-lower-device.patch @@ -0,0 +1,61 @@ +From foo@baz Fri Apr 6 10:01:11 CEST 2018 +From: Greg Kroah-Hartman +Date: Fri, 6 Apr 2018 09:46:28 +0200 +Subject: Revert "ip6_vti: adjust vti mtu according to mtu of lower device" + +From: Greg Kroah-Hartman + +This reverts commit 813b2dad2cb59d2759f1538e65d56dcccdb18a94 which is +commit 53c81e95df1793933f87748d36070a721f6cb287 upstream. + +Ben writes that there are a number of follow-on patches needed to fix +this up, but they get complex to backport, and some custom fixes are +needed, so let's just revert this and wait for a "real" set of patches +to resolve this to be submitted if it is really needed. + +Reported-by: Ben Hutchings +Cc: Petr Vorel +Cc: Alexey Kodanev +Cc: David S. Miller +Cc: Stefano Brivio +Signed-off-by: Greg Kroah-Hartman +--- + net/ipv6/ip6_vti.c | 20 -------------------- + 1 file changed, 20 deletions(-) + +--- a/net/ipv6/ip6_vti.c ++++ b/net/ipv6/ip6_vti.c +@@ -626,7 +626,6 @@ static void vti6_link_config(struct ip6_ + { + struct net_device *dev = t->dev; + struct __ip6_tnl_parm *p = &t->parms; +- struct net_device *tdev = NULL; + + memcpy(dev->dev_addr, &p->laddr, sizeof(struct in6_addr)); + memcpy(dev->broadcast, &p->raddr, sizeof(struct in6_addr)); +@@ -639,25 +638,6 @@ static void vti6_link_config(struct ip6_ + dev->flags |= IFF_POINTOPOINT; + else + dev->flags &= ~IFF_POINTOPOINT; +- +- if (p->flags & IP6_TNL_F_CAP_XMIT) { +- int strict = (ipv6_addr_type(&p->raddr) & +- (IPV6_ADDR_MULTICAST | IPV6_ADDR_LINKLOCAL)); +- struct rt6_info *rt = rt6_lookup(t->net, +- &p->raddr, &p->laddr, +- p->link, strict); +- +- if (rt) +- tdev = rt->dst.dev; +- ip6_rt_put(rt); +- } +- +- if (!tdev && p->link) +- tdev = __dev_get_by_index(t->net, p->link); +- +- if (tdev) +- dev->mtu = max_t(int, tdev->mtu - dev->hard_header_len, +- IPV6_MIN_MTU); + } + + /** diff --git a/queue-4.15/series b/queue-4.15/series index 2239b851ab7..3f34bd9aa95 100644 --- a/queue-4.15/series +++ b/queue-4.15/series @@ -66,3 +66,7 @@ vt-change-sgr-21-to-follow-the-standards.patch arm-dts-dra76-evm-set-powerhold-property-for-tps65917.patch net-hns-fix-ethtool-private-flags.patch fix-slab-name-biovec-1-21-12.patch +revert-arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch +revert-arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch +revert-cpufreq-fix-governor-module-removal-race.patch +revert-ip6_vti-adjust-vti-mtu-according-to-mtu-of-lower-device.patch