diff options
author | Josh Boyer <jwboyer@redhat.com> | 2013-12-10 18:27:14 -0500 |
---|---|---|
committer | Josh Boyer <jwboyer@redhat.com> | 2013-12-10 18:27:14 -0500 |
commit | fd75f39f64fbcf928c5b2e454c1ecc80a6538a00 (patch) | |
tree | 0a6fc8af00f9fd5a1fd01b35daa9f1cc720daf0b /kernel.spec | |
parent | f78c22dfe99be93e44b349ba21b12860b8090433 (diff) | |
download | kernel-fd75f39f64fbcf928c5b2e454c1ecc80a6538a00.tar.gz kernel-fd75f39f64fbcf928c5b2e454c1ecc80a6538a00.tar.xz kernel-fd75f39f64fbcf928c5b2e454c1ecc80a6538a00.zip |
Revert upstream selinux change causing sync hang (rhbz 1033965)
- Add patch to fix radeon from crashing
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index 5181e8fc3..9ffaa713a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -62,7 +62,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 1 +%global baserelease 2 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -706,6 +706,11 @@ Patch25129: cpupower-Fix-segfault-due-to-incorrect-getopt_long-a.patch #CVE-2013-6382 rhbz 1033603 1034670 Patch25157: xfs-underflow-bug-in-xfs_attrlist_by_handle.patch +#rhbz 1033965 +Patch25169: 0001-Revert-selinux-consider-filesystem-subtype-in-polici.patch + +Patch25170: 0001-drm-radeon-dpm-Fix-hwmon-crash.patch + # END OF PATCH DEFINITIONS %endif @@ -1378,6 +1383,11 @@ ApplyPatch cpupower-Fix-segfault-due-to-incorrect-getopt_long-a.patch #CVE-2013-6382 rhbz 1033603 1034670 ApplyPatch xfs-underflow-bug-in-xfs_attrlist_by_handle.patch +#rhbz 1033965 +ApplyPatch 0001-Revert-selinux-consider-filesystem-subtype-in-polici.patch + +ApplyPatch 0001-drm-radeon-dpm-Fix-hwmon-crash.patch + # END OF PATCH APPLICATIONS %endif @@ -2190,6 +2200,10 @@ fi # ||----w | # || || %changelog +* Tue Dec 10 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc3.git1.2 +- Revert upstream selinux change causing sync hang (rhbz 1033965) +- Add patch to fix radeon from crashing + * Tue Dec 10 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc3.git1.1 - Linux v3.13-rc3-157-g17b2112 - Reenable debugging options. |