diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-01-13 07:27:24 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-01-13 07:27:24 +0100 |
| commit | 74164a8271ed245a7c9b1fd7071a344738c25008 (patch) | |
| tree | 1212ca07494a14a42a9d8e3410fd8d6d4e45d827 /kernel.spec | |
| parent | f8c452d5fd66e71f1fe80dcce808e8246e11e830 (diff) | |
| parent | daebcac5174fc731de75e6ab0c01805707eac3b7 (diff) | |
| download | kernel-74164a8271ed245a7c9b1fd7071a344738c25008.tar.gz kernel-74164a8271ed245a7c9b1fd7071a344738c25008.tar.xz kernel-74164a8271ed245a7c9b1fd7071a344738c25008.zip | |
Merge remote-tracking branch 'origin/f25' into f25-user-thl-vanilla-fedorakernel-4.9.3-200.vanilla.knurd.1.fc25kernel-4.9.3-200.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec index 1715e4cec..212f2fc5c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -58,7 +58,7 @@ Summary: The Linux kernel %define stable_rc 0 # Do we have a -stable update to apply? -%define stable_update 2 +%define stable_update 3 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -643,8 +643,14 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch #ongoing complaint, full discussion delayed until ksummit/plumbers Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch +# Work around thinkpad firmware memory layout issues and efi_mem_reserve() +Patch850: 0001-efi-prune-invalid-memory-map-entries.patch + # Request from dwalsh -Patch850: selinux-namespace-fix.patch +Patch851: selinux-namespace-fix.patch + +#rhbz 1390308 +Patch852: nouveau-add-maxwell-to-backlight-init.patch # END OF PATCH DEFINITIONS @@ -2187,6 +2193,12 @@ fi # # %changelog +* Thu Jan 12 2017 Laura Abbott <labbott@fedoraproject.org> - 4.9.3-200 +- Linux v4.9.3 + +* Wed Jan 11 2017 Laura Abbott <labbott@fedoraproject.org> +- Add fix for some thinkpads missed during the rebase. + * Mon Jan 09 2017 Laura Abbott <labbott@fedoraproject.org> - 4.9.2-200 - Linux v4.9.2 rebase |