diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-08-03 21:08:32 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-08-03 21:09:12 -0400 |
| commit | 27951d8b7e06bf96a5662128c8bd522fe3f35f90 (patch) | |
| tree | 11d23c840e66e08490a4d429091c15409279d211 /kernel.spec | |
| parent | dba6c5bc710a29758b9177c51c1be48c981da99a (diff) | |
| download | kernel-27951d8b7e06bf96a5662128c8bd522fe3f35f90.tar.gz kernel-27951d8b7e06bf96a5662128c8bd522fe3f35f90.tar.xz kernel-27951d8b7e06bf96a5662128c8bd522fe3f35f90.zip | |
Fix i386 boot bug correctly (rhbz 1247382)
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec index 4f908544f..32d084fdd 100644 --- a/kernel.spec +++ b/kernel.spec @@ -40,7 +40,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 @@ -582,7 +582,7 @@ Patch502: firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch Patch503: drm-i915-turn-off-wc-mmaps.patch -Patch505: 0001-Revert-dm-fix-casting-bug-in-dm_merge_bvec.patch +Patch505: 0001-dm-fix-dm_merge_bvec-regression-on-32-bit-systems.patch # CVE-2015-5697 (rhbz 1249011 1249013) Patch506: md-use-kzalloc-when-bitmap-is-disabled.patch @@ -2025,6 +2025,7 @@ fi # %changelog * Mon Aug 03 2015 Josh Boyer <jwboyer@fedoraproject.org> +- Fix i386 boot bug correctly (rhbz 1247382) - CVE-2015-5697 info leak in md driver (rhbz 1249011 1249013) * Mon Aug 03 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.2.0-0.rc5.git0.1 |