summaryrefslogtreecommitdiffstats
path: root/patch-5.16-redhat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patch-5.16-redhat.patch')
-rw-r--r--patch-5.16-redhat.patch14
1 files changed, 7 insertions, 7 deletions
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);