diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-18 07:28:26 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-18 07:28:26 +0200 |
| commit | fb0ee5f89eaade5cb1e76dc0becf55061172ff0c (patch) | |
| tree | bc0201f18c2eea72737290eb96bcd86ccf778a4f /kernel.spec | |
| parent | 0a091eb0b1eb95688e5b2a6afb1dfb823ad33f54 (diff) | |
| parent | 3856ef7eb1db56671e00a069af6c0614c6b21c7f (diff) | |
| download | kernel-fb0ee5f89eaade5cb1e76dc0becf55061172ff0c.tar.gz kernel-fb0ee5f89eaade5cb1e76dc0becf55061172ff0c.tar.xz kernel-fb0ee5f89eaade5cb1e76dc0becf55061172ff0c.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.7.0-0.rc0.git2.2.vanilla.knurd.1.fc25kernel-4.7.0-0.rc0.git2.2.vanilla.knurd.1.fc24kernel-4.7.0-0.rc0.git2.2.vanilla.knurd.1.fc23kernel-4.7.0-0.rc0.git2.2.vanilla.knurd.1.fc22
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index 858fa9e64..419bfd5c8 100644 --- a/kernel.spec +++ b/kernel.spec @@ -6,7 +6,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. For rawhide # and/or a kernel built from an rc or git snapshot, released_kernel should # be 0. -%global released_kernel 1 +%global released_kernel 0 # Sign modules on x86. Make sure the config files match this setting if more # architectures are added. @@ -44,7 +44,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 @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 0 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -133,7 +133,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1} @@ -516,8 +516,6 @@ Source5005: kbuild-AFTER_LINK.patch Patch420: arm64-avoid-needing-console-to-enable-serial-console.patch -Patch421: arm64-acpi-drop-expert-patch.patch - # http://www.spinics.net/lists/arm-kernel/msg490981.html Patch422: geekbox-v4-device-tree-support.patch @@ -2083,7 +2081,7 @@ fi %ifarch %{cpupowerarchs} %files -n kernel-tools-libs %{_libdir}/libcpupower.so.0 -%{_libdir}/libcpupower.so.0.0.0 +%{_libdir}/libcpupower.so.0.0.1 %files -n kernel-tools-libs-devel %{_libdir}/libcpupower.so @@ -2167,6 +2165,22 @@ fi # # %changelog +* Tue May 17 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc0.git2.2 +- Adjust solib for cpupower + +* Tue May 17 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc0.git2.1 +- Linux v4.6-1278-g1649098 +- Enable CONFIG_INTEL_POWERCLAMP +- pm, ACPI, mmc, regulator, i2c, hwmon, edac, led, arm64, x86, sched, RAS merges + +* Mon May 16 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc0.git1.1 +- Linux v4.6-153-g3469d26 +- Reenable debugging options. +- locking, efi, signals, rcu merges + +* Mon May 16 2016 Justin M. Forbes <jforbes@fedoraproject.org> +- Disable CONFIG_DEBUG_VM_PGFLAGS on non debug kernels (rhbz 1335173) + * Mon May 16 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-1 - Linux v4.6 - CVE-2016-3713 kvm: out-of-bounds access in set_var_mtrr_msr (rhbz 1332139 1336410) |