Linux v4.14.7

4 files changed, 5 insertions, 83 deletions

diff --git a/allwinner-net-emac.patch b/allwinner-net-emac.patch
index bad1e4490..c9c7cd0ec 100644
--- a/allwinner-net-emac.patch
+++ b/allwinner-net-emac.patch
@@ -1932,43 +1932,3 @@ index e5ff734..9eb7f65 100644
 -- 
 cgit v1.1
 
-From 45ab4b13e46325d00f4acdb365d406e941a15f81 Mon Sep 17 00:00:00 2001
-From: Lars Persson <lars.persson@axis.com>
-Date: Fri, 1 Dec 2017 11:12:44 +0100
-Subject: stmmac: reset last TSO segment size after device open
-
-The mss variable tracks the last max segment size sent to the TSO
-engine. We do not update the hardware as long as we receive skb:s with
-the same value in gso_size.
-
-During a network device down/up cycle (mapped to stmmac_release() and
-stmmac_open() callbacks) we issue a reset to the hardware and it
-forgets the setting for mss. However we did not zero out our mss
-variable so the next transmission of a gso packet happens with an
-undefined hardware setting.
-
-This triggers a hang in the TSO engine and eventuelly the netdev
-watchdog will bark.
-
-Fixes: f748be531d70 ("stmmac: support new GMAC4")
-Signed-off-by: Lars Persson <larper@axis.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-index f63c2dd..d725053 100644
---- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -2588,6 +2588,7 @@ static int stmmac_open(struct net_device *dev)
- 
- 	priv->dma_buf_sz = STMMAC_ALIGN(buf_sz);
- 	priv->rx_copybreak = STMMAC_RX_COPYBREAK;
-+	priv->mss = 0;
- 
- 	ret = alloc_dma_desc_resources(priv);
- 	if (ret < 0) {
--- 
-cgit v1.1
-
diff --git a/arm64-thunderX-fix-ipv6-checksum-offload.patch b/arm64-thunderX-fix-ipv6-checksum-offload.patch
deleted file mode 100644
index 221189997..000000000
--- a/arm64-thunderX-fix-ipv6-checksum-offload.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From fa6d7cb5d76cf0467c61420fc9238045aedfd379 Mon Sep 17 00:00:00 2001
-From: Sunil Goutham <sgoutham@cavium.com>
-Date: Thu, 23 Nov 2017 22:34:31 +0300
-Subject: net: thunderx: Fix TCP/UDP checksum offload for IPv6 pkts
-
-Don't offload IP header checksum to NIC.
-
-This fixes a previous patch which enabled checksum offloading
-for both IPv4 and IPv6 packets.  So L3 checksum offload was
-getting enabled for IPv6 pkts.  And HW is dropping these pkts
-as it assumes the pkt is IPv4 when IP csum offload is set
-in the SQ descriptor.
-
-Fixes:  3a9024f52c2e ("net: thunderx: Enable TSO and checksum offloads for ipv6")
-Signed-off-by: Sunil Goutham <sgoutham@cavium.com>
-Signed-off-by: Aleksey Makarov <aleksey.makarov@auriga.com>
-Reviewed-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 1 -
- 1 file changed, 1 deletion(-)
-
-(limited to 'drivers/net/ethernet/cavium/thunder/nicvf_queues.c')
-
-diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
-index d4496e9..8b2c31e 100644
---- a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
-+++ b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
-@@ -1355,7 +1355,6 @@ nicvf_sq_add_hdr_subdesc(struct nicvf *nic, struct snd_queue *sq, int qentry,
- 
- 	/* Offload checksum calculation to HW */
- 	if (skb->ip_summed == CHECKSUM_PARTIAL) {
--		hdr->csum_l3 = 1; /* Enable IP csum calculation */
- 		hdr->l3_offset = skb_network_offset(skb);
- 		hdr->l4_offset = skb_transport_offset(skb);
- 
--- 
-cgit v1.1
-
diff --git a/kernel.spec b/kernel.spec
index 8e853acd1..b05faee32 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 6
+%define stable_update 7
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -609,8 +609,6 @@ Patch332: arm64-socionext-96b-enablement.patch
 
 Patch335: arm-exynos-fix-usb3.patch
 
-Patch399: arm64-thunderX-fix-ipv6-checksum-offload.patch
-
 # 400 - IBM (ppc/s390x) patches
 
 # 500 - Temp fixes/CVEs etc
@@ -2235,6 +2233,9 @@ fi
 #
 #
 %changelog
+* Mon Dec 18 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.7-200
+- Linux v4.14.7
+
 * Thu Dec 14 2017 Jeremy Cline <jeremy@jcline.org> - 4.14.6-200
 - Linux v4.14.6
 - Security fix for CVE-2017-17449 (rhbz 1525762 1525763)
diff --git a/sources b/sources
index 760740837..bd0037952 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-4.14.tar.xz) = 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 SHA512 (perf-man-4.14.tar.gz) = 76a9d8adc284cdffd4b3fbb060e7f9a14109267707ce1d03f4c3239cd70d8d164f697da3a0f90a363fbcac42a61d3c378afbcc2a86f112c501b9cb5ce74ef9f8
-SHA512 (patch-4.14.6.xz) = c37b437f740fbb480766149ca1c6ddb5ee763b88b034b9b4eaf3ce000f299545ee19a93638d1a4161ab0c76ec73e1a53b2264b94213d53d6ad7dcda6bee45b8c
+SHA512 (patch-4.14.7.xz) = 7a0aa00af73fbac34a0f96ebbd977688275538f8f2f3e0ba32ac3f9eb0d02498dd75d4d6481cfdd1236d45616231dd376a453ce8c04663ceaeb5ccc553996251