summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2011-05-14 11:10:56 -0400
committerKyle McMartin <kyle@redhat.com>2011-05-14 11:11:01 -0400
commit9787d244d77869af27c5382d0c4ddc92cf439a11 (patch)
tree28ed62c5279f55cbbafdac555c3e3f9a8ac5c987 /kernel.spec
parent480eadaeb57b1f12a3f47aff25ed7001f3387842 (diff)
downloadkernel-9787d244d77869af27c5382d0c4ddc92cf439a11.tar.gz
kernel-9787d244d77869af27c5382d0c4ddc92cf439a11.tar.xz
kernel-9787d244d77869af27c5382d0c4ddc92cf439a11.zip
tmpfs: implement generic xattr support
Merge Eric Paris' patch to add xattr support to tmpfs, so that it can be used to host mockroots for mass rebuilds. Drop IMA disabling patch, which is no longer necessary since it's run time (but unused) cost is now minimized.
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec14
1 files changed, 10 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec
index fad464436..7a84f4e1c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -619,6 +619,8 @@ Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch
Patch160: linux-2.6-32bit-mmap-exec-randomization.patch
Patch161: linux-2.6-i386-nx-emulation.patch
+Patch170: tmpfs-implement-generic-xattr-support.patch
+
Patch200: linux-2.6-debug-sizeof-structs.patch
Patch202: linux-2.6-debug-taint-vm.patch
Patch203: linux-2.6-debug-vm-would-have-oomkilled.patch
@@ -628,8 +630,6 @@ Patch380: linux-2.6-defaults-pci_no_msi.patch
Patch381: linux-2.6-defaults-pci_use_crs.patch
Patch383: linux-2.6-defaults-aspm.patch
-Patch385: ima-allow-it-to-be-completely-disabled-and-default-off.patch
-
Patch390: linux-2.6-defaults-acpi-video.patch
Patch391: linux-2.6-acpi-video-dos.patch
Patch393: acpi-ec-add-delay-before-write.patch
@@ -1181,6 +1181,7 @@ ApplyPatch linux-2.6-32bit-mmap-exec-randomization.patch
#
# bugfixes to drivers and filesystems
#
+ApplyPatch tmpfs-implement-generic-xattr-support.patch
# ext4
@@ -1218,8 +1219,6 @@ ApplyPatch linux-2.6-defaults-pci_use_crs.patch
# enable ASPM by default on hardware we expect to work
ApplyPatch linux-2.6-defaults-aspm.patch
-#ApplyPatch ima-allow-it-to-be-completely-disabled-and-default-off.patch
-
#
# SCSI Bits.
#
@@ -1937,6 +1936,13 @@ fi
# and build.
%changelog
+* Sat May 14 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.39-0.rc7.git6.1
+- tmpfs: implement generic xattr support
+ Merge Eric Paris' patch to add xattr support to tmpfs, so that it can be
+ used to host mockroots for mass rebuilds.
+- Drop IMA disabling patch, which is no longer necessary since it's run time
+ (but unused) cost is now minimized.
+
* Sat May 14 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.39-0.rc7.git6.0
- Update to 2.6.39-rc7-git6