diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-02-22 07:15:58 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-02-22 07:15:58 +0100 |
commit | ab8b9a31a125bfaf9e1f7848283bf7b4f548da8e (patch) | |
tree | 0f2ed5cba583b9c571bca93b021c8e66c05c87d6 /kernel.spec | |
parent | b1a6b166a78086a57e49b2099e74d5b6c90974e2 (diff) | |
parent | c6d02e4149f5bbb0e4e0b7fd9f9b32c9024ee809 (diff) | |
download | kernel-ab8b9a31a125bfaf9e1f7848283bf7b4f548da8e.tar.gz kernel-ab8b9a31a125bfaf9e1f7848283bf7b4f548da8e.tar.xz kernel-ab8b9a31a125bfaf9e1f7848283bf7b4f548da8e.zip |
Merge remote-tracking branch 'origin/master'kernel-4.11.0-0.rc0.git1.1.vanilla.knurd.1.fc26kernel-4.11.0-0.rc0.git1.1.vanilla.knurd.1.fc25kernel-4.11.0-0.rc0.git1.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index 88364cc37..176325273 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. @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # 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} @@ -627,6 +627,9 @@ Patch852: selinux-allow-context-mounts-on-tmpfs-etc.patch #CVE-2017-2596 rhbz 1417812 1417813 Patch854: kvm-fix-page-struct-leak-in-handle_vmon.patch +# build breakage during merge window +Patch855: sched-core-Fix-build-paravirt-build-on-arm-and-arm64.patch + # END OF PATCH DEFINITIONS %endif @@ -2204,6 +2207,13 @@ fi # # %changelog +* Tue Feb 21 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc0.git1.1 + +- Linux v4.10-1242-g9763dd6 + +* Tue Feb 21 2017 Laura Abbott <labbott@fedoraproject.org> +- Reenable debugging options. + * Mon Feb 20 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-1 - Disable debugging options. - Linux v4.10 |