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:56:06 -0700
commit4cf99ad8cb71e6c570c3cc36cc09cc2d4303a4b5 (patch)
tree3b88e714c4784ab7cd6c46710af66753b5b971c0 /kernel.spec
parent66883f977b18f5b1ad32d6ef7281a458b7e7c5b3 (diff)
downloadkernel-4cf99ad8cb71e6c570c3cc36cc09cc2d4303a4b5.tar.gz
kernel-4cf99ad8cb71e6c570c3cc36cc09cc2d4303a4b5.tar.xz
kernel-4cf99ad8cb71e6c570c3cc36cc09cc2d4303a4b5.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 adefdf04f..12f577110 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -616,6 +616,9 @@ Patch512: 0001-Revert-drm-i915-fbdev-Actually-configure-untiled-dis.patch
# rhbz 1689750, patch submitted upstream
Patch513: 0001-virt-vbox-Implement-passing-requestor-info-to-the-ho.patch
+# rhbz 1683382
+Patch515: nfsv4.1-avoid-false-retries.patch
+
# END OF PATCH DEFINITIONS
%endif