summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-05-14 08:20:07 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-05-14 08:20:07 -0400
commit2844a7d7e1ae32cc002d5dcf1e1181dc6934cb14 (patch)
treee893236ed2bde7ae91826879cd83ceb16ddf866e /kernel.spec
parent8d884182acb48df17078306d88497878e60a45ce (diff)
downloadkernel-2844a7d7e1ae32cc002d5dcf1e1181dc6934cb14.tar.gz
kernel-2844a7d7e1ae32cc002d5dcf1e1181dc6934cb14.tar.xz
kernel-2844a7d7e1ae32cc002d5dcf1e1181dc6934cb14.zip
Fix non-empty dir removal in overlayfs (rhbz 1220915)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec9
1 files changed, 9 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 7806b696f..3262eacb3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -613,6 +613,9 @@ Patch26192: blk-loop-avoid-too-many-pending-per-work-IO.patch
#rhbz 1219343
Patch26200: 0001-HID-usbhid-Add-HID_QUIRK_NOGET-for-Aten-DVI-KVM-swit.patch
+#rhbz 1220915
+Patch26201: ovl-don-t-remove-non-empty-opaque-directory.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1346,6 +1349,9 @@ ApplyPatch blk-loop-avoid-too-many-pending-per-work-IO.patch
#rhbz 1219343
ApplyPatch 0001-HID-usbhid-Add-HID_QUIRK_NOGET-for-Aten-DVI-KVM-swit.patch
+#rhbz 1220915
+ApplyPatch ovl-don-t-remove-non-empty-opaque-directory.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2206,6 +2212,9 @@ fi
#
#
%changelog
+* Thu May 14 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix non-empty dir removal in overlayfs (rhbz 1220915)
+
* Wed May 13 2015 Laura Abbott <labbott@fedoraproject.org>
- Fix spew from KVM switch (rhbz 1219343)