Merge pull request #3233 from dm0-/linux

Bump Linux 4.14.39 to 4.14.42 and 4.16.7 to 4.16.10

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest

@@ -1,4 +1,4 @@
 DIST linux-4.14.tar.xz 100770500 SHA256 f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7 SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 WHIRLPOOL fee10d54ecb210156aa55364ecc15867127819e9f7ff9ec5f6ef159b1013e2ae3d3a28d35c62d663886cbe826b996a1387671766093be002536309045a8e4d10
 DIST linux-4.16.tar.xz 103020152 SHA256 63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9 SHA512 ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662 WHIRLPOOL e03466f20fbac5b54c963845449d88589cb01fcc47837adbcf7ed1fb7b74422251df3a9a83f3a74d79f086a0f2eaa3cdf3654869717c72c3fb3a195f3f721942
-DIST patch-4.14.39.xz 1091116 SHA256 8686e9a0ff123163799f098767c91af4a0d58bc789a7de2cfe9d7b886f5b4fbd SHA512 28568e50fc70016426b65706f3de12cd723d7e5d5d88a23bbb02915b221db904744108328c3a63bb3f620e059f116930bb0b2d16271b53ed70dc320f6f3daf69 WHIRLPOOL 3890a928bf21c8f3dbfaed4ef6983c97d19982b51f7f4193101258406c0993a738e494f06a9e23bcf6d3ebb9b650a9a807cd2be5efcfaad17ea06bbf6907af61
+DIST patch-4.14.42.xz 1126044 SHA256 e454422387e40bc55f87bbc84058c930ba5072fdbf4c77c0cb21d49b16ce7ca7 SHA512 5480a05cca0c0d30dad2a8f5d1165d9e07d3d4252f4131c3f0be89261afed36859c42ba1e7eee8cc7ae0964a226d7435ccdba652a8390bef9153e1882ec190c8 WHIRLPOOL fdd6e1bc40a5fa6ba50413c514903171e844243d2900ca3d0567b11ba07e3d7c8f019168f1baf5273b681eb37b1240c19bde3550484a167f1e64a6dc10221f91
-DIST patch-4.16.7.xz 170468 SHA256 f5ef83461054024814846eb816c76eba1b903f7e3e38c3417027b33070b60d91 SHA512 576c2b520d444e11a9ca45ed3ed03822007ab6ff778a1759aa0f65c96946fe3e169e71d48d11e6d3b8627a99cdc20abfb0c84d7b6c9b0d2afa4d5fee9ed3aa41 WHIRLPOOL 18fddc99266393bb8baef92dc99c6b87e611bde1812b196e8a23cbcac981702896aa0092d16eda61473694b32ccc852d4aeae90395ae1122a124e09b15dbbf5a
+DIST patch-4.16.10.xz 221656 SHA256 9fe6093be401fe0ff3f6cb3d428f137119a7befaf86d70f18c7e88871c1852d6 SHA512 53d700ca245341cd6493ecd01af069b2015564c9d7514751348e57047838bb1a6379f065dcf21312cf8f861f5569d28e7445846b40d14c225c644a69c09da5d1 WHIRLPOOL 0fa37388cfeb4c20f54b7d6c14d6333a480560a7b585816a7c8db603fece51e8f6a56faca40a7e07cd9541db264988fbe13f95b391009d6bca05ed4b35eaff9d

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.14.42.ebuild

@@ -36,7 +36,6 @@ UNIPATCH_LIST="
 	${PATCH_DIR}/z0003-block-factor-out-__blkdev_issue_zero_pages.patch \
 	${PATCH_DIR}/z0004-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch \
 	${PATCH_DIR}/z0005-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \
-	${PATCH_DIR}/z0006-net-don-t-call-update_pmtu-unconditionally.patch \
+	${PATCH_DIR}/z0006-Revert-random-use-a-different-mixing-algorithm-for-a.patch \
-	${PATCH_DIR}/z0007-Revert-random-use-a-different-mixing-algorithm-for-a.patch \
+	${PATCH_DIR}/z0007-Revert-random-fix-crng_ready-test.patch \
-	${PATCH_DIR}/z0008-Revert-random-fix-crng_ready-test.patch \
 "

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch

@@ -1,7 +1,7 @@
-From b01ce574a3dbe02a1ba268d642cb2c2f9e04610f Mon Sep 17 00:00:00 2001
+From ffd5377aceb838e4ea5939a3b1f849ec224b8de3 Mon Sep 17 00:00:00 2001
 From: Vito Caputo <vito.caputo@coreos.com>
 Date: Wed, 25 Nov 2015 02:59:45 -0800
-Subject: [PATCH 1/8] kbuild: derive relative path for KBUILD_SRC from CURDIR
+Subject: [PATCH 1/7] kbuild: derive relative path for KBUILD_SRC from CURDIR
 
 This enables relocating source and build trees to different roots,
 provided they stay reachable relative to one another.  Useful for
@@ -12,7 +12,7 @@ by some undesirable path component.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 248b99283f71..52ac28192bce 100644
+index 777f5685a36b..a89fc287c171 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0002-Add-arm64-coreos-verity-hash.patch

@@ -1,7 +1,7 @@
-From 55c9d1b4cb5171ae43a41b7f40a14155e3378bb6 Mon Sep 17 00:00:00 2001
+From c619175d2833bb003235543d6b66c16c756906b3 Mon Sep 17 00:00:00 2001
 From: Geoff Levand <geoff@infradead.org>
 Date: Fri, 11 Nov 2016 17:28:52 -0800
-Subject: [PATCH 2/8] Add arm64 coreos verity hash
+Subject: [PATCH 2/7] Add arm64 coreos verity hash
 
 Signed-off-by: Geoff Levand <geoff@infradead.org>
 ---

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0003-block-factor-out-__blkdev_issue_zero_pages.patch

@@ -1,7 +1,7 @@
-From ab9f78195a96f734ae16f86b891b371f91120ce2 Mon Sep 17 00:00:00 2001
+From ab65417b6b298377e19d2fabaf7860e41f9a1d76 Mon Sep 17 00:00:00 2001
 From: Ilya Dryomov <idryomov@gmail.com>
 Date: Mon, 16 Oct 2017 15:59:09 +0200
-Subject: [PATCH 3/8] block: factor out __blkdev_issue_zero_pages()
+Subject: [PATCH 3/7] block: factor out __blkdev_issue_zero_pages()
 
 blkdev_issue_zeroout() will use this in !BLKDEV_ZERO_NOFALLBACK case.
 

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0004-block-cope-with-WRITE-ZEROES-failing-in-blkdev_issue.patch

@@ -1,7 +1,7 @@
-From 828a36750859ed7102c186d34aec3e59cca5d708 Mon Sep 17 00:00:00 2001
+From 47966ff75cf00648fe5bbb716605c64c8297fd6a Mon Sep 17 00:00:00 2001
 From: Ilya Dryomov <idryomov@gmail.com>
 Date: Mon, 16 Oct 2017 15:59:10 +0200
-Subject: [PATCH 4/8] block: cope with WRITE ZEROES failing in
+Subject: [PATCH 4/7] block: cope with WRITE ZEROES failing in
  blkdev_issue_zeroout()
 
 sd_config_write_same() ignores ->max_ws_blocks == 0 and resets it to

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0005-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch

@@ -1,7 +1,7 @@
-From abb1256ed29052f60998d493fa776df3c9301aa2 Mon Sep 17 00:00:00 2001
+From f071eec1a3267d926e9b15886b6e074daf0409ab Mon Sep 17 00:00:00 2001
 From: David Michael <david.michael@coreos.com>
 Date: Thu, 8 Feb 2018 21:23:12 -0500
-Subject: [PATCH 5/8] tools/objtool/Makefile: Don't fail on fallthrough with
+Subject: [PATCH 5/7] tools/objtool/Makefile: Don't fail on fallthrough with
  new GCCs
 
 ---

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-Revert-random-use-a-different-mixing-algorithm-for-a.patch

@@ -1,12 +1,10 @@
-From cd5d57a0ca6a544157631df57273a24c9af3401f Mon Sep 17 00:00:00 2001
+From a7b72cbefa2ab6827a0896d4167852759a9e02c3 Mon Sep 17 00:00:00 2001
 From: Jeremy Cline <jeremy@jcline.org>
 Date: Wed, 2 May 2018 15:16:29 -0400
-Subject: [PATCH 7/8] Revert "random: use a different mixing algorithm for
+Subject: [PATCH 6/7] Revert "random: use a different mixing algorithm for
  add_device_randomness()"
 
-This reverts commit 89b59f050347d376c2ace8b1ceb908a218cfdc2e.
+This reverts commit 7b6b1f3a192372937164d1293b432c640ffc7c8f.
-
-Signed-off-by: Jeremy Cline <jeremy@jcline.org>
 ---
  drivers/char/random.c | 55 ++++-----------------------------------------------
  1 file changed, 4 insertions(+), 51 deletions(-)

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0006-net-don-t-call-update_pmtu-unconditionally.patch

@@ -1,166 +0,0 @@
-From 041394c0f00b8c9232bb8160d4c2a0bc386afedc Mon Sep 17 00:00:00 2001
-From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
-Date: Thu, 25 Jan 2018 19:03:03 +0100
-Subject: [PATCH 6/8] net: don't call update_pmtu unconditionally
-
-Commit f15ca723c1ebe6c1a06bc95fda6b62cd87b44559 upstream.
-
-Some dst_ops (e.g. md_dst_ops)) doesn't set this handler. It may result to:
-"BUG: unable to handle kernel NULL pointer dereference at           (null)"
-
-Let's add a helper to check if update_pmtu is available before calling it.
-
-Fixes: 52a589d51f10 ("geneve: update skb dst pmtu on tx path")
-Fixes: a93bf0ff4490 ("vxlan: update skb dst pmtu on tx path")
-CC: Roman Kapl <code@rkapl.cz>
-CC: Xin Long <lucien.xin@gmail.com>
-Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Benjamin Gilbert <bgilbert@redhat.com>
----
- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 3 +--
- drivers/net/vxlan.c                     | 6 ++----
- include/net/dst.h                       | 8 ++++++++
- net/ipv4/ip_tunnel.c                    | 3 +--
- net/ipv4/ip_vti.c                       | 2 +-
- net/ipv6/ip6_tunnel.c                   | 5 ++---
- net/ipv6/ip6_vti.c                      | 2 +-
- net/ipv6/sit.c                          | 4 ++--
- 8 files changed, 18 insertions(+), 15 deletions(-)
-
-diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
-index 7774654c2ccb..7a5ed5a5391e 100644
---- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
-+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
-@@ -1447,8 +1447,7 @@ void ipoib_cm_skb_too_long(struct net_device *dev, struct sk_buff *skb,
- 	struct ipoib_dev_priv *priv = ipoib_priv(dev);
- 	int e = skb_queue_empty(&priv->cm.skb_queue);
- 
--	if (skb_dst(skb))
--		skb_dst(skb)->ops->update_pmtu(skb_dst(skb), NULL, skb, mtu);
-+	skb_dst_update_pmtu(skb, mtu);
- 
- 	skb_queue_tail(&priv->cm.skb_queue, skb);
- 	if (e)
-diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
-index bb44f0c6891f..3d9c5b35a4a7 100644
---- a/drivers/net/vxlan.c
-+++ b/drivers/net/vxlan.c
-@@ -2158,8 +2158,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
- 		if (skb_dst(skb)) {
- 			int mtu = dst_mtu(ndst) - VXLAN_HEADROOM;
- 
--			skb_dst(skb)->ops->update_pmtu(skb_dst(skb), NULL,
--						       skb, mtu);
-+			skb_dst_update_pmtu(skb, mtu);
- 		}
- 
- 		tos = ip_tunnel_ecn_encap(tos, old_iph, skb);
-@@ -2200,8 +2199,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
- 		if (skb_dst(skb)) {
- 			int mtu = dst_mtu(ndst) - VXLAN6_HEADROOM;
- 
--			skb_dst(skb)->ops->update_pmtu(skb_dst(skb), NULL,
--						       skb, mtu);
-+			skb_dst_update_pmtu(skb, mtu);
- 		}
- 
- 		tos = ip_tunnel_ecn_encap(tos, old_iph, skb);
-diff --git a/include/net/dst.h b/include/net/dst.h
-index 694c2e6ae618..ebfb4328fdb1 100644
---- a/include/net/dst.h
-+++ b/include/net/dst.h
-@@ -520,4 +520,12 @@ static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst)
- }
- #endif
- 
-+static inline void skb_dst_update_pmtu(struct sk_buff *skb, u32 mtu)
-+{
-+	struct dst_entry *dst = skb_dst(skb);
-+
-+	if (dst && dst->ops->update_pmtu)
-+		dst->ops->update_pmtu(dst, NULL, skb, mtu);
-+}
-+
- #endif /* _NET_DST_H */
-diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
-index 13f7bbc0168d..a2fcc20774a6 100644
---- a/net/ipv4/ip_tunnel.c
-+++ b/net/ipv4/ip_tunnel.c
-@@ -521,8 +521,7 @@ static int tnl_update_pmtu(struct net_device *dev, struct sk_buff *skb,
- 	else
- 		mtu = skb_dst(skb) ? dst_mtu(skb_dst(skb)) : dev->mtu;
- 
--	if (skb_dst(skb))
--		skb_dst(skb)->ops->update_pmtu(skb_dst(skb), NULL, skb, mtu);
-+	skb_dst_update_pmtu(skb, mtu);
- 
- 	if (skb->protocol == htons(ETH_P_IP)) {
- 		if (!skb_is_gso(skb) &&
-diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
-index 89453cf62158..c9cd891f69c2 100644
---- a/net/ipv4/ip_vti.c
-+++ b/net/ipv4/ip_vti.c
-@@ -209,7 +209,7 @@ static netdev_tx_t vti_xmit(struct sk_buff *skb, struct net_device *dev,
- 
- 	mtu = dst_mtu(dst);
- 	if (skb->len > mtu) {
--		skb_dst(skb)->ops->update_pmtu(skb_dst(skb), NULL, skb, mtu);
-+		skb_dst_update_pmtu(skb, mtu);
- 		if (skb->protocol == htons(ETH_P_IP)) {
- 			icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,
- 				  htonl(mtu));
-diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
-index 7e11f6a811f5..d61a82fd4b60 100644
---- a/net/ipv6/ip6_tunnel.c
-+++ b/net/ipv6/ip6_tunnel.c
-@@ -652,7 +652,7 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
- 		if (rel_info > dst_mtu(skb_dst(skb2)))
- 			goto out;
- 
--		skb_dst(skb2)->ops->update_pmtu(skb_dst(skb2), NULL, skb2, rel_info);
-+		skb_dst_update_pmtu(skb2, rel_info);
- 	}
- 	if (rel_type == ICMP_REDIRECT)
- 		skb_dst(skb2)->ops->redirect(skb_dst(skb2), NULL, skb2);
-@@ -1141,8 +1141,7 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
- 		mtu = 576;
- 	}
- 
--	if (skb_dst(skb) && !t->parms.collect_md)
--		skb_dst(skb)->ops->update_pmtu(skb_dst(skb), NULL, skb, mtu);
-+	skb_dst_update_pmtu(skb, mtu);
- 	if (skb->len - t->tun_hlen - eth_hlen > mtu && !skb_is_gso(skb)) {
- 		*pmtu = mtu;
- 		err = -EMSGSIZE;
-diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
-index 7c0f647b5195..2493a40bc4b1 100644
---- a/net/ipv6/ip6_vti.c
-+++ b/net/ipv6/ip6_vti.c
-@@ -486,7 +486,7 @@ vti6_xmit(struct sk_buff *skb, struct net_device *dev, struct flowi *fl)
- 
- 	mtu = dst_mtu(dst);
- 	if (!skb->ignore_df && skb->len > mtu) {
--		skb_dst(skb)->ops->update_pmtu(dst, NULL, skb, mtu);
-+		skb_dst_update_pmtu(skb, mtu);
- 
- 		if (skb->protocol == htons(ETH_P_IPV6)) {
- 			if (mtu < IPV6_MIN_MTU)
-diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
-index f03c1a562135..b35d8905794c 100644
---- a/net/ipv6/sit.c
-+++ b/net/ipv6/sit.c
-@@ -925,8 +925,8 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,
- 			df = 0;
- 		}
- 
--		if (tunnel->parms.iph.daddr && skb_dst(skb))
--			skb_dst(skb)->ops->update_pmtu(skb_dst(skb), NULL, skb, mtu);
-+		if (tunnel->parms.iph.daddr)
-+			skb_dst_update_pmtu(skb, mtu);
- 
- 		if (skb->len > mtu && !skb_is_gso(skb)) {
- 			icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);
--- 
-2.14.3
-

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.14/z0007-Revert-random-fix-crng_ready-test.patch

@@ -1,11 +1,9 @@
-From 85c6e5097fd62b172e6b57ae3498bcfb43c9a0b7 Mon Sep 17 00:00:00 2001
+From 7fcb636f40e812b1b277249479398c2ac083fe6d Mon Sep 17 00:00:00 2001
 From: Jeremy Cline <jeremy@jcline.org>
 Date: Wed, 2 May 2018 15:18:03 -0400
-Subject: [PATCH 8/8] Revert "random: fix crng_ready() test"
+Subject: [PATCH 7/7] Revert "random: fix crng_ready() test"
 
-This reverts commit cd8d7a5778a4abf76ee8fe8f1bfcf78976029f8d.
+This reverts commit 6e513bc20ca63f594632eca4e1968791240b8f18.
-
-Signed-off-by: Jeremy Cline <jeremy@jcline.org>
 ---
  drivers/char/random.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch

@@ -1,4 +1,4 @@
-From b72b87b393f03fe32b247391a8eb072349d9ee3b Mon Sep 17 00:00:00 2001
+From 1145539e4c9c4e847c98154251974e820bf3ba40 Mon Sep 17 00:00:00 2001
 From: Vito Caputo <vito.caputo@coreos.com>
 Date: Wed, 25 Nov 2015 02:59:45 -0800
 Subject: [PATCH 1/5] kbuild: derive relative path for KBUILD_SRC from CURDIR
@@ -12,7 +12,7 @@ by some undesirable path component.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 1c5d5d8c45e2..68e3f691e4eb 100644
+index 33f3c94f02ca..182cbaf39c78 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0002-Add-arm64-coreos-verity-hash.patch

@@ -1,4 +1,4 @@
-From f72fd22d61bb1c5a08f3996a61aebe0177654695 Mon Sep 17 00:00:00 2001
+From 6f1753c2b080fe2833609363d155e7cd926854f1 Mon Sep 17 00:00:00 2001
 From: Geoff Levand <geoff@infradead.org>
 Date: Fri, 11 Nov 2016 17:28:52 -0800
 Subject: [PATCH 2/5] Add arm64 coreos verity hash

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0003-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch

@@ -1,4 +1,4 @@
-From 9e479de1280b84529cccabfbd684d7987203cfdd Mon Sep 17 00:00:00 2001
+From 48974ab4198d6987411df44694e71103537f645e Mon Sep 17 00:00:00 2001
 From: David Michael <david.michael@coreos.com>
 Date: Thu, 8 Feb 2018 21:23:12 -0500
 Subject: [PATCH 3/5] tools/objtool/Makefile: Don't fail on fallthrough with

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0004-Revert-random-use-a-different-mixing-algorithm-for-a.patch

@@ -1,4 +1,4 @@
-From da8ffaf7ae8962d916c87b366eae5a01f91f1ecb Mon Sep 17 00:00:00 2001
+From 100826fe85596218471154268ecd406b32d02841 Mon Sep 17 00:00:00 2001
 From: Jeremy Cline <jeremy@jcline.org>
 Date: Wed, 2 May 2018 15:16:29 -0400
 Subject: [PATCH 4/5] Revert "random: use a different mixing algorithm for

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.16/z0005-Revert-random-fix-crng_ready-test.patch

@@ -1,4 +1,4 @@
-From c93d72b3d1f54c0712ac16f05aa78cfc78798afb Mon Sep 17 00:00:00 2001
+From 18cddd4c68b0a3f7b5be0c16eacb2a2621acfac2 Mon Sep 17 00:00:00 2001
 From: Jeremy Cline <jeremy@jcline.org>
 Date: Wed, 2 May 2018 15:18:03 -0400
 Subject: [PATCH 5/5] Revert "random: fix crng_ready() test"