summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-02-08 08:48:02 -0500
committerJosh Boyer <jwboyer@redhat.com>2012-02-08 08:48:17 -0500
commita0668fa819dbbf94eea6e1c5803508cb0fc99934 (patch)
tree831cb5c8ff084b8b4ce12771c46b8f344e9423f8 /kernel.spec
parent32e0cc2b9733351c55355fa7b1e3d18c83aef45e (diff)
downloadkernel-a0668fa819dbbf94eea6e1c5803508cb0fc99934.tar.gz
kernel-a0668fa819dbbf94eea6e1c5803508cb0fc99934.tar.xz
kernel-a0668fa819dbbf94eea6e1c5803508cb0fc99934.zip
Add new upstream NFS id mapping patches from Steve Dickson
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec7
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 172deb8ce..7be1fcfdc 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -718,6 +718,9 @@ Patch2901: linux-2.6-v4l-dvb-experimental.patch
# NFSv4
Patch1101: linux-3.1-keys-remove-special-keyring.patch
+Patch1102: linux-3.3-newidmapper-01.patch
+Patch1103: linux-3.3-newidmapper-02.patch
+Patch1104: linux-3.3-newidmapper-03.patch
# patches headed upstream
Patch12016: disable-i8042-check-on-apple-mac.patch
@@ -1327,6 +1330,9 @@ ApplyPatch arm-smsc-support-reading-mac-address-from-device-tree.patch
# NFSv4
ApplyPatch linux-3.1-keys-remove-special-keyring.patch
+ApplyPatch linux-3.3-newidmapper-01.patch
+ApplyPatch linux-3.3-newidmapper-02.patch
+ApplyPatch linux-3.3-newidmapper-03.patch
# USB
@@ -2313,6 +2319,7 @@ fi
* Wed Feb 08 2012 Josh Boyer <jwboyer@redhat.com>
- CVE-2011-4086 jbd2: unmapped buffer with _Unwritten or _Delay flags set can
lead to DoS (rhbz 788260)
+- Add new upstream NFS id mapping patches from Steve Dickson
* Tue Feb 07 2012 Josh Boyer <jwboyer@redhat.com>
- Linux 3.3-rc2-git6 (upstream 6bd113f1f4a8c0d05c4dbadb300319e0e3526db4)