diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-10-19 07:49:16 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-10-19 07:49:16 +0200 |
| commit | 804ddc26701e6a1f4985c2599e7fdbf7464a7d2e (patch) | |
| tree | 232ee440cb1b0861ef8e372f9a3d8f768f5a8edf /kernel.spec | |
| parent | 4f731edd9534a6374ef998d211cd2981d7d88ebe (diff) | |
| parent | 9472421366604c0504d9da77569f45c5b459c9bb (diff) | |
| download | kernel-804ddc26701e6a1f4985c2599e7fdbf7464a7d2e.tar.gz kernel-804ddc26701e6a1f4985c2599e7fdbf7464a7d2e.tar.xz kernel-804ddc26701e6a1f4985c2599e7fdbf7464a7d2e.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.9.0-0.rc1.git1.1.vanilla.knurd.1.fc25kernel-4.9.0-0.rc1.git1.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index 1448921ec..e1f558e50 100644 --- a/kernel.spec +++ b/kernel.spec @@ -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 2 +%global baserelease 1 %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 %global rcrev 1 # 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} @@ -612,6 +612,8 @@ Patch502: firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch Patch508: kexec-uefi-copy-secure_boot-flag-in-boot-params.patch +Patch509: MODSIGN-Don-t-try-secure-boot-if-EFI-runtime-is-disa.patch + #CVE-2016-3134 rhbz 1317383 1317384 Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch @@ -621,6 +623,9 @@ Patch848: 0001-cpupower-Correct-return-type-of-cpu_power_is_cpu_onl.patch #ongoing complaint, full discussion delayed until ksummit/plumbers Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch +#rhbz 1384701 +Patch850: 0001-arm64-kernel-numa-fix-ACPI-boot-cpu-numa-node-mappin.patch + # END OF PATCH DEFINITIONS %endif @@ -2162,6 +2167,19 @@ fi # # %changelog +* Tue Oct 18 2016 Laura Abbott <labbott@redhat.com> +- Gracefully bail out of secureboot when EFI runtime is disabled +- Fix for aarch64 boot regression (rhbz 1384701) + +* Tue Oct 18 2016 Peter Robinson <pbrobinson@fedoraproject.org> +- Disable ACPI_CPPC_CPUFREQ on aarch64 + +* Tue Oct 18 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc1.git1.1 +- Linux v4.9-rc1-3-g14155ca + +* Tue Oct 18 2016 Laura Abbott <labbott@redhat.com> +- Reenable debugging options. + * Mon Oct 17 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc1.git0.2 - Disable CONFIG_RTC_DRV_DS1307_CENTURY |