diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-01-10 08:30:44 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-01-10 08:30:44 +0100 |
| commit | cc53fe7d4f11a98ada113163f905957c0666d763 (patch) | |
| tree | c45ccfd7c8c176f542967a470481c9d72ab3fac5 /kernel.spec | |
| parent | 6c9d602a8ee2ec59d3966c82b50befbb57a151c9 (diff) | |
| parent | 7bea88339bb12065a4f224fe2a24a7dbdade8d4c (diff) | |
| download | kernel-4.15.0-0.rc7.git1.1.vanilla.knurd.1.fc27.tar.gz kernel-4.15.0-0.rc7.git1.1.vanilla.knurd.1.fc27.tar.xz kernel-4.15.0-0.rc7.git1.1.vanilla.knurd.1.fc27.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.15.0-0.rc7.git1.1.vanilla.knurd.1.fc27
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 85e7e4fc5..36be5fb3f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 7 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -129,7 +129,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} @@ -565,6 +565,11 @@ Patch205: MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch Patch206: MODSIGN-Support-not-importing-certs-from-db.patch +# bz 1497559 - Make kernel MODSIGN code not error on missing variables +Patch207: 0001-Make-get_cert_list-not-complain-about-cert-lists-tha.patch +Patch208: 0002-Add-efi_status_to_str-and-rework-efi_status_to_err.patch +Patch209: 0003-Make-get_cert_list-use-efi_status_to_str-to-print-er.patch + Patch210: disable-i8042-check-on-apple-mac.patch Patch211: drm-i915-hush-check-crtc-state.patch @@ -603,10 +608,6 @@ Patch332: arm64-socionext-96b-enablement.patch # 500 - Temp fixes/CVEs etc -# rhbz 1525523 -# https://patchwork.kernel.org/patch/10104349/ -Patch500: e1000e-Fix-e1000_check_for_copper_link_ich8lan-return-value..patch - # 600 - Patches for improved Bay and Cherry Trail device support # Below patches are submitted upstream, awaiting review / merging Patch610: 0010-Input-silead-Add-support-for-capactive-home-button-f.patch @@ -1911,6 +1912,12 @@ fi # # %changelog +* Tue Jan 09 2018 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc7.git1.1 +- Linux v4.15-rc7-79-gef7f8cec80a0 + +* Tue Jan 09 2018 Laura Abbott <labbott@redhat.com> +- Reenable debugging options. + * Mon Jan 08 2018 Laura Abbott <labbott@redhat.com> - Disable CONFIG_RESET_ATTACK_MITIGATION (rhbz 1532058) |