]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Apr 2018 08:05:12 +0000 (10:05 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Apr 2018 08:05:12 +0000 (10:05 +0200)
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

queue-4.14/revert-arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch [new file with mode: 0644]
queue-4.14/revert-arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch [new file with mode: 0644]
queue-4.14/revert-cpufreq-fix-governor-module-removal-race.patch [new file with mode: 0644]
queue-4.14/revert-ip6_vti-adjust-vti-mtu-according-to-mtu-of-lower-device.patch [new file with mode: 0644]
queue-4.14/series

diff --git a/queue-4.14/revert-arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch b/queue-4.14/revert-arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch
new file mode 100644 (file)
index 0000000..3c7dfae
--- /dev/null
@@ -0,0 +1,33 @@
+From foo@baz Fri Apr  6 10:03:41 CEST 2018
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Fri, 6 Apr 2018 08:48:11 +0200
+Subject: Revert "ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 0ed43f944a4070d04eddacded8629d0ddb9c8003 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 <ben.hutchings@codethink.co.uk>
+Cc: Andrew F. Davis <afd@ti.com>
+Cc: Tony Lindgren <tony@atomide.com>
+Cc: Sasha Levin <alexander.levin@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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.14/revert-arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch b/queue-4.14/revert-arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch
new file mode 100644 (file)
index 0000000..f0efbe1
--- /dev/null
@@ -0,0 +1,42 @@
+From foo@baz Fri Apr  6 10:03:41 CEST 2018
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Fri, 6 Apr 2018 08:56:07 +0200
+Subject: Revert "ARM: dts: omap3-n900: Fix the audio CODEC's reset pin"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 2f1f60c4b903f0f5464560783655ff74c9663a92 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 <ben.hutchings@codethink.co.uk>
+Cc: Andrew F. Davis <afd@ti.com>
+Cc: Tony Lindgren <tony@atomide.com>
+Cc: Sasha Levin <alexander.levin@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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.14/revert-cpufreq-fix-governor-module-removal-race.patch b/queue-4.14/revert-cpufreq-fix-governor-module-removal-race.patch
new file mode 100644 (file)
index 0000000..b0926b4
--- /dev/null
@@ -0,0 +1,43 @@
+From foo@baz Fri Apr  6 10:03:41 CEST 2018
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Fri, 6 Apr 2018 09:06:23 +0200
+Subject: Revert "cpufreq: Fix governor module removal race"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 0049457bfde661cf47410eaacad65845c9a2bb45 which was
+commit a8b149d32b663c1a4105273295184b78f53d33cf upstream.
+
+The backport was not correct, so just drop it entirely.
+
+Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Cc: Viresh Kumar <viresh.kumar@linaro.org>
+Cc: Sasha Levin <alexander.levin@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/cpufreq/cpufreq.c |    6 ------
+ 1 file changed, 6 deletions(-)
+
+--- a/drivers/cpufreq/cpufreq.c
++++ b/drivers/cpufreq/cpufreq.c
+@@ -631,8 +631,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);
+       }
+@@ -761,10 +759,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.14/revert-ip6_vti-adjust-vti-mtu-according-to-mtu-of-lower-device.patch b/queue-4.14/revert-ip6_vti-adjust-vti-mtu-according-to-mtu-of-lower-device.patch
new file mode 100644 (file)
index 0000000..29e3d9b
--- /dev/null
@@ -0,0 +1,61 @@
+From foo@baz Fri Apr  6 10:03:41 CEST 2018
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Fri, 6 Apr 2018 09:45:56 +0200
+Subject: Revert "ip6_vti: adjust vti mtu according to mtu of lower device"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit e6cfc525163ea3375113a9dcc234c2cdd8dbf643 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 <ben.hutchings@codethink.co.uk>
+Cc: Petr Vorel <pvorel@suse.cz>
+Cc: Alexey Kodanev <alexey.kodanev@oracle.com>
+Cc: David S. Miller <davem@davemloft.net>
+Cc: Stefano Brivio <sbrivio@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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);
+ }
+ /**
index 6ad80eb5e5c30d765c702fcc941b791d5da2f153..cc758e00d6955cdfe93604752901a952eb7dd740 100644 (file)
@@ -61,3 +61,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