diff options
| author | Justin M. Forbes <jforbes@redhat.com> | 2012-10-05 10:47:26 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@redhat.com> | 2012-10-05 10:47:26 -0500 |
| commit | 1ae0b0fe93f0c4e6166fc45a7d43a2d0bffd51fc (patch) | |
| tree | 0256a07e5e7b98481a8a482eb4d387a747792dd2 /kernel.spec | |
| parent | fc85362a27e6f8ea343d1e201a01c311781d2a09 (diff) | |
| parent | 8c0399628afc54985b89fd8c856f442a110230b8 (diff) | |
| download | kernel-1ae0b0fe93f0c4e6166fc45a7d43a2d0bffd51fc.tar.gz kernel-1ae0b0fe93f0c4e6166fc45a7d43a2d0bffd51fc.tar.xz kernel-1ae0b0fe93f0c4e6166fc45a7d43a2d0bffd51fc.zip | |
merge fixup
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index 0001efb8..2b4671c0 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 3 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -690,7 +690,7 @@ Patch1100: handle-efi-roms.patch # DRM #atch1700: drm-edid-try-harder-to-fix-up-broken-headers.patch -Patch1800: drm-vgem.patch +#Patch1800: drm-vgem.patch # nouveau + drm fixes # intel drm is all merged upstream @@ -887,6 +887,7 @@ Requires: kernel-tools = %{version}-%{release} Provides: cpupowerutils-devel = 1:009-0.6.p1 Obsoletes: cpupowerutils-devel < 1:009-0.6.p1 Requires: kernel-tools-libs = %{version}-%{release} +Provides: kernel-tools-devel %description -n kernel-tools-libs-devel This package contains the development files for the tools/ directory from the kernel source. @@ -1409,7 +1410,7 @@ ApplyPatch secure-boot-20120924.patch # DRM core #ApplyPatch drm-edid-try-harder-to-fix-up-broken-headers.patch -ApplyPatch drm-vgem.patch +#ApplyPatch drm-vgem.patch # Nouveau DRM @@ -2316,6 +2317,18 @@ fi - v3.6-6670-gecefbd9 - Reenable debugging options. +* Fri Oct 5 2012 Peter Robinson <pbrobinson@fedoraproject.org> +- Build MMC in on OMAP and Tegra until we work out why modules don't work + +* Wed Oct 03 2012 Adam Jackson <ajax@redhat.com> +- Drop vgem patches, not doing anything yet. + +* Wed Oct 03 2012 Josh Boyer <jwboyer@redhat.com> +- Make sure kernel-tools-libs-devel provides kernel-tools-devel + +* Tue Oct 02 2012 Josh Boyer <jwboyer@redhat.com> +- Patch from David Howells to fix overflow on 32-bit X.509 certs (rhbz 861322) + * Tue Oct 2 2012 Peter Robinson <pbrobinson@fedoraproject.org> - Update ARM configs for 3.6 final - Add highbank SATA driver for stability |