summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorLaura Abbott <labbott@redhat.com>2019-03-27 12:51:26 -0700
committerLaura Abbott <labbott@redhat.com>2019-03-27 12:51:26 -0700
commit9c960b158ed16f54f51e77ae43cd193ef0a38813 (patch)
treec4ff068ee5aa2831f0c30df16b53bb2add665fd7 /kernel.spec
parent0dc18f640a54a9b3e105a3b843d5d2803bd65bb1 (diff)
downloadkernel-9c960b158ed16f54f51e77ae43cd193ef0a38813.tar.gz
kernel-9c960b158ed16f54f51e77ae43cd193ef0a38813.tar.xz
kernel-9c960b158ed16f54f51e77ae43cd193ef0a38813.zip
bring back NFS fix
When doing the 5.0 rebase, I mistakenly thought a conflict meant a patch had been merged. Turns out, it was an actual (minor) conflict. Bring back the rebased patch which can actually be dropped with 5.1.
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 49f2508f8..f5efc845f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -608,6 +608,9 @@ Patch513: 0001-virt-vbox-Implement-passing-requestor-info-to-the-ho.patch
# rhbz 1688283
Patch514: v3-tpm-fix-an-invalid-condition-in-tpm_common_poll.patch
+# rhbz 1683382
+Patch515: nfsv4.1-avoid-false-retries.patch
+
# END OF PATCH DEFINITIONS
%endif