From af70da82a61ff6cc760ce3d5444cffda6a5d3f89 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Wed, 13 Apr 2022 16:41:51 -0500
Subject: kernel-5.16.20-0

* Wed Apr 13 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.20-0]
- Linux v5.16.19 (Justin M. Forbes)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 kernel.spec             | 11 +++++++----
 patch-5.16-redhat.patch | 14 +++++++-------
 sources                 |  6 +++---
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/kernel.spec b/kernel.spec
index 57bfd4e14..dc6625d50 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -130,7 +130,7 @@ Summary: The Linux kernel
 # The kernel tarball/base version
 %define kversion 5.16
 
-%define rpmversion 5.16.19
+%define rpmversion 5.16.20
 %define patchversion 5.16
 %define pkgrelease 200
 
@@ -692,7 +692,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16.19.tar.xz
+Source0: linux-5.16.20.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1386,8 +1386,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.16.19 -c
-mv linux-5.16.19 linux-%{KVERREL}
+%setup -q -n kernel-5.16.20 -c
+mv linux-5.16.20 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2985,6 +2985,9 @@ fi
 #
 #
 %changelog
+* Wed Apr 13 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.20-0]
+- Linux v5.16.20 (Justin M. Forbes)
+
 * Fri Apr 08 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.19-0]
 - Config update for 5.16.19 (Justin M. Forbes)
 
diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch
index a670e9250..61f715c00 100644
--- a/patch-5.16-redhat.patch
+++ b/patch-5.16-redhat.patch
@@ -73,7 +73,7 @@ index 1887d92e8e92..17706dc91ec9 100644
 +previous buffer contents to be preserved. This allows bounce-buffering
 +implementations to optimise DMA_FROM_DEVICE transfers.
 diff --git a/Makefile b/Makefile
-index c16a8a2ffd73..6f81a359f7ce 100644
+index 1e8d249c996b..5a19e68510d9 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -1329,7 +1329,7 @@ index 011373b91ae0..3d6519612422 100644
 
  enum ath11k_firmware_mode {
 diff --git a/drivers/net/wireless/ath/ath11k/mhi.c b/drivers/net/wireless/ath/ath11k/mhi.c
-index 49c0b1ad40a0..95f5a1960676 100644
+index f2149241fb13..7045c5efaea1 100644
 --- a/drivers/net/wireless/ath/ath11k/mhi.c
 +++ b/drivers/net/wireless/ath/ath11k/mhi.c
 @@ -356,6 +356,7 @@ int ath11k_mhi_register(struct ath11k_pci *ab_pci)
@@ -1341,7 +1341,7 @@ index 49c0b1ad40a0..95f5a1960676 100644
  		break;
  	default:
 diff --git a/drivers/net/wireless/ath/ath11k/pci.c b/drivers/net/wireless/ath/ath11k/pci.c
-index 4c348bacf2cb..9fe496d35b38 100644
+index 754578f3dcf1..1ec567eb6154 100644
 --- a/drivers/net/wireless/ath/ath11k/pci.c
 +++ b/drivers/net/wireless/ath/ath11k/pci.c
 @@ -25,7 +25,7 @@
@@ -1786,10 +1786,10 @@ index 5298c3a278c5..f9d84016280e 100644
 
  static const struct xattr_handler nfs4_xattr_nfs4_acl_handler = {
 diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
-index 499bef9fe118..f3265575c28d 100644
+index 94f1876afab2..0a80ed81578f 100644
 --- a/fs/nfs/nfs4state.c
 +++ b/fs/nfs/nfs4state.c
-@@ -2098,8 +2098,7 @@ static int nfs4_try_migration(struct nfs_server *server, const struct cred *cred
+@@ -2099,8 +2099,7 @@ static int nfs4_try_migration(struct nfs_server *server, const struct cred *cred
  	}
 
  	inode = d_inode(server->super->s_root);
@@ -2045,10 +2045,10 @@ index 8723ae70ea1f..fb2d773498c2 100644
 +	return ret;
  }
 diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
-index 917e708a4561..110645cd5150 100644
+index 3a98a1316307..04de5dfd07a9 100644
 --- a/net/netfilter/nf_conntrack_core.c
 +++ b/net/netfilter/nf_conntrack_core.c
-@@ -1749,6 +1749,9 @@ resolve_normal_ct(struct nf_conn *tmpl,
+@@ -1800,6 +1800,9 @@ resolve_normal_ct(struct nf_conn *tmpl,
  			return 0;
  		if (IS_ERR(h))
  			return PTR_ERR(h);
diff --git a/sources b/sources
index d7b61b6eb..343cdc843 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.16.19.tar.xz) = 65a7f3ee6f8fdb61c8d2eb85fbc429449f6bc3ef7f431fa9fdd05e1d52c06d5a509e0d40dbe52358ad5a53171357a186e4cce434e8e10edb8f7c376fdffa8ae4
-SHA512 (kernel-abi-stablelists-5.16.19-200.tar.bz2) = 5c0b6f1d05851ef7e93cb4c0104b6581219540385b5114e98d6a3e5a42ff3489c00aa022649f25f3c8d25718b6601a3cc98fb403a7313c670bbf177e6743836f
-SHA512 (kernel-kabi-dw-5.16.19-200.tar.bz2) = 272099b1ed1e8263df7333914fa6cde3d93f59e5777c9574dc10afd95ef3692c22883b9cc6ff8c82eac11ea4342d0c5868a95c771d984540dcb7493784ab2887
+SHA512 (linux-5.16.20.tar.xz) = f0de58e8663aaaa8ffc82027082a0086c589efa449e3cb5c0efcb79fc942202f5dc88111a70155724802d663705807cd7c497e0df4922f4aed0fd974a831e84d
+SHA512 (kernel-abi-stablelists-5.16.20-200.tar.bz2) = 71f75f557cfc6bbc621a81831cbba29da17f4e9646045f81c5109591ae11bda3b9dce7120e9951f6d5667c9a9145664b081fb8bfa852580ef570766cf6ffa82e
+SHA512 (kernel-kabi-dw-5.16.20-200.tar.bz2) = 9ec0f3d1aea18ec8f6e248d52a64500fce1de5f72e949ae642dd3e80e47a483dcbb399a60b40b871eced9bd1e1985d54e542b8b3f91469cd3b5e02205694bb0c
-- 
cgit