diff options
| author | Dave Jones <davej@redhat.com> | 2011-12-14 15:48:10 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2011-12-14 15:48:10 -0500 |
| commit | f3fbdcb713c55e0ae54b46e3af628d472df51c54 (patch) | |
| tree | 3f67b082ab2b7a8b3afdb8da0743d7995e580ff7 /kernel.spec | |
| parent | 59806edb4d89586894ad7a52e4bc13656ff49a9c (diff) | |
| download | kernel-f3fbdcb713c55e0ae54b46e3af628d472df51c54.tar.gz kernel-f3fbdcb713c55e0ae54b46e3af628d472df51c54.tar.xz kernel-f3fbdcb713c55e0ae54b46e3af628d472df51c54.zip | |
Enabled the in-kernel idmapper.
keyring: allow special keyrings to be cleared
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index d74872258..9793c71c9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -464,7 +464,7 @@ Summary: The Linux kernel # First the general kernel 2.6 required versions as per # Documentation/Changes # -%define kernel_dot_org_conflicts ppp < 2.4.3-3, isdn4k-utils < 3.2-32, nfs-utils < 1.0.7-12, e2fsprogs < 1.37-4, util-linux < 2.12, jfsutils < 1.1.7-2, reiserfs-utils < 3.6.19-2, xfsprogs < 2.6.13-4, procps < 3.2.5-6.3, oprofile < 0.9.1-2, device-mapper-libs < 1.02.63-2, mdadm < 3.2.1-5 +%define kernel_dot_org_conflicts ppp < 2.4.3-3, isdn4k-utils < 3.2-32, nfs-utils < 1.2.5-7.fc17, e2fsprogs < 1.37-4, util-linux < 2.12, jfsutils < 1.1.7-2, reiserfs-utils < 3.6.19-2, xfsprogs < 2.6.13-4, procps < 3.2.5-6.3, oprofile < 0.9.1-2, device-mapper-libs < 1.02.63-2, mdadm < 3.2.1-5 # # Then a series of requirements that are distribution specific, either @@ -697,6 +697,7 @@ Patch2901: linux-2.6-v4l-dvb-experimental.patch # fs fixes # NFSv4 +Patch1101: linux-3.1-keys-remove-special-keyring.patch # patches headed upstream Patch12016: disable-i8042-check-on-apple-mac.patch @@ -1297,6 +1298,7 @@ ApplyPatch arm-smsc-support-reading-mac-address-from-device-tree.patch # eCryptfs # NFSv4 +ApplyPatch linux-3.1-keys-remove-special-keyring.patch # USB @@ -2229,6 +2231,10 @@ fi # ||----w | # || || %changelog +* Wed Dec 14 2011 Steve Dickson <steved@redhat.com> +- Enabled the in-kernel idmapper. +- keyring: allow special keyrings to be cleared + * Wed Dec 14 2011 Dave Jones <davej@redhat.com> - 3.2.0-0.rc5.git2.1 - Linux 3.2-rc5-git2 (373da0a2a33018d560afcb2c77f8842985d79594) |