diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-11-14 09:55:52 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-11-14 09:55:52 -0500 |
| commit | c7a536b3308eb65a29df2fbce8c1c3bc2d6cacee (patch) | |
| tree | 1fe4d9b18b32b5d6323e604470d38228bb1a8231 /kernel.spec | |
| parent | 90ac8d9ea520e8833afb3169e27cc5f1fbe24fc0 (diff) | |
| download | kernel-c7a536b3308eb65a29df2fbce8c1c3bc2d6cacee.tar.gz kernel-c7a536b3308eb65a29df2fbce8c1c3bc2d6cacee.tar.xz kernel-c7a536b3308eb65a29df2fbce8c1c3bc2d6cacee.zip | |
Linux 3.2-rc1-git4
Also fix CVE-2011-4131: nfs4_getfacl decoding kernel oops (rhbz 753236)
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index 60320370a..c0a73194b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -87,7 +87,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 1 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -707,6 +707,9 @@ Patch21090: bcma-brcmsmac-compat.patch Patch21091: pci-Rework-ASPM-disable-code.patch +#rhbz 753236 +Patch21029: nfsv4-include-bitmap-in-nfsv4_get_acl_data.patch + %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1347,6 +1350,9 @@ ApplyPatch bcma-brcmsmac-compat.patch ApplyPatch pci-Rework-ASPM-disable-code.patch +#rhbz 753236 +ApplyPatch nfsv4-include-bitmap-in-nfsv4_get_acl_data.patch + # END OF PATCH APPLICATIONS %endif @@ -2053,6 +2059,10 @@ fi # ||----w | # || || %changelog +* Mon Nov 14 2011 Josh Boyer <jwboyer@redhat.com> +- CVE-2011-4131: nfs4_getfacl decoding kernel oops (rhbz 753236) +- Linux 3.2-rc1-git4 + * Sat Nov 12 2011 Josh Boyer <jwboyer@redhat.com> - Linux 3.2-rc1-git3 |