4.11.9-100.fc24.gnu

5 files changed, 15 insertions, 58 deletions

diff --git a/freed-ora/current/f24/actual_udpencap_fix.patch b/freed-ora/current/f24/actual_udpencap_fix.patch
deleted file mode 100644
index bba8b7676..000000000
--- a/freed-ora/current/f24/actual_udpencap_fix.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Steffen Klassert <steffen.klassert@secunet.com>
-Subject: [PATCH] esp4: Fix udpencap for local TCP packets.
-
-Locally generated TCP packets are usually cloned, so we
-do skb_cow_data() on this packets. After that we need to
-reload the pointer to the esp header. On udpencap this
-header has an offset to skb_transport_header, so take this
-offset into account.
-
-Fixes: commit cac2661c53f ("esp4: Avoid skb_cow_data whenever possible")
-Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
----
- net/ipv4/esp4.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
-index b1e2444..ab71fbb 100644
---- a/net/ipv4/esp4.c
-+++ b/net/ipv4/esp4.c
-@@ -223,6 +223,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
- 	int extralen;
- 	int tailen;
- 	__be64 seqno;
-+	int esp_offset = 0;
- 	__u8 proto = *skb_mac_header(skb);
- 
- 	/* skb is pure payload to encrypt */
-@@ -288,6 +289,8 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
- 			break;
- 		}
- 
-+		esp_offset = (unsigned char *)esph - (unsigned char *)uh;
-+
- 		*skb_mac_header(skb) = IPPROTO_UDP;
- 	}
- 
-@@ -397,7 +400,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
- 		goto error;
- 	nfrags = err;
- 	tail = skb_tail_pointer(trailer);
--	esph = ip_esp_hdr(skb);
-+	esph = (struct ip_esp_hdr *)(skb_transport_header(skb) + esp_offset);
- 
- skip_cow:
- 	esp_output_fill_trailer(tail, tfclen, plen, proto);
diff --git a/freed-ora/current/f24/kernel.spec b/freed-ora/current/f24/kernel.spec
index f9fb49753..89499e581 100644
--- a/freed-ora/current/f24/kernel.spec
+++ b/freed-ora/current/f24/kernel.spec
@@ -92,7 +92,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 8
+%define stable_update 9
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -672,10 +672,6 @@ Patch867: 0002-NFSv4-Fix-callback-server-shutdown.patch
 # rhbz 1455780
 Patch676: 2-2-nvme-Quirk-APST-on-Intel-600P-P3100-devices.patch
 
-# rhbz 1458222 1458499
-# As linked from http://marc.info/?l=linux-netdev&m=149336766030175&w=2
-Patch679: actual_udpencap_fix.patch
-
 # rhbz 1459272
 Patch680: 0001-platform-x86-thinkpad_acpi-guard-generic-hotkey-case.patch
 Patch681: 0002-platform-x86-thinkpad_acpi-add-mapping-for-new-hotke.patch
@@ -2343,6 +2339,12 @@ fi
 #
 # 
 %changelog
+* Thu Jul  6 2017 Alexandre Oliva <lxoliva@fsfla.org> -libre
+- GNU Linux-libre 4.11.9-gnu.
+
+* Wed Jul 05 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.9-100
+- Linux v4.11.9
+
 * Sat Jul  1 2017 Alexandre Oliva <lxoliva@fsfla.org> -libre
 - GNU Linux-libre 4.11.8-gnu.
 
diff --git a/freed-ora/current/f24/patch-4.11-gnu-4.11.8-gnu.xz.sign b/freed-ora/current/f24/patch-4.11-gnu-4.11.8-gnu.xz.sign
deleted file mode 100644
index ee59e204d..000000000
--- a/freed-ora/current/f24/patch-4.11-gnu-4.11.8-gnu.xz.sign
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEABECAAYFAllVnZsACgkQvLfPh359R6fyfgCfRQ/hVwkZ7NQawqSIINi673yg
-Li0AnAvmRmjzt8BOyJV46sLoALKu1FPo
-=xqia
------END PGP SIGNATURE-----
diff --git a/freed-ora/current/f24/patch-4.11-gnu-4.11.9-gnu.xz.sign b/freed-ora/current/f24/patch-4.11-gnu-4.11.9-gnu.xz.sign
new file mode 100644
index 000000000..1889dfab3
--- /dev/null
+++ b/freed-ora/current/f24/patch-4.11-gnu-4.11.9-gnu.xz.sign
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEABECAAYFAlldxbgACgkQvLfPh359R6e+AACgj8pZXY0Wxu6EMix9N8K8WUcs
++zMAnRJ0D8pTZYNGvx/cCxF/RPeodphI
+=X/Z3
+-----END PGP SIGNATURE-----
diff --git a/freed-ora/current/f24/sources b/freed-ora/current/f24/sources
index 861261922..7b0d3b5c1 100644
--- a/freed-ora/current/f24/sources
+++ b/freed-ora/current/f24/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-libre-4.11-gnu.tar.xz) = f1d9138024b127385248de5c8eb72123b717bbbaba3e80bded20f073acac816a7ea979c4677ddc72252a8ec77c6a6c1d1738b1c20106f7d53ef39c9cf64c1853
 SHA512 (perf-man-4.11.tar.gz) = 0b070d2f10a743329de2f532e2d7e19ef385a3e6ef3c700b591ae2697604dbe542b36e31121b3e37517ee8071ab800386fa8663c24a5b36520a18e096c6eefc8
-SHA512 (patch-4.11-gnu-4.11.8-gnu.xz) = 9a14f067b23c88f5aa8bfcb8f71ff70601da287ac32126349ada1125548b8e8004abf5ee95c806f2e2ae4b581db37c9fb8ec36373b2d98fbd0263ee19d5ec559
+SHA512 (patch-4.11-gnu-4.11.9-gnu.xz) = 6408d84e17577ed466252369613168fcfb7615f79bc117018a6a677d1b8cb029a52fe3cf4fe270f9c8e3219b83751e8638a1281a7321b1a7359ad51b4ab2a111