diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-01-04 11:22:53 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-01-04 11:22:53 +0100 |
| commit | b5a51e127bff95933989264561fa9b43668c04c3 (patch) | |
| tree | a8c2c0f955905d83c36a0acdf66309382aec433d /kernel.spec | |
| parent | 6b2401f0cbf9f01f08b5d562e2fa8def64842f0d (diff) | |
| parent | b5cf2a10ddc784456e8600fd8a5be116ff542c1d (diff) | |
| download | kernel-b5a51e127bff95933989264561fa9b43668c04c3.tar.gz kernel-b5a51e127bff95933989264561fa9b43668c04c3.tar.xz kernel-b5a51e127bff95933989264561fa9b43668c04c3.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index e3e2a267e..1afdf17f2 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 1 +%global baserelease 3 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -664,6 +664,15 @@ Patch636: 0001-ahci-Annotate-PCI-ids-for-mobile-Intel-chipsets-as-s.patch Patch637: 0002-ahci-Add-PCI-ids-for-Intel-Bay-Trail-Cherry-Trail-an.patch Patch638: 0003-ahci-Allow-setting-a-default-LPM-policy-for-mobile-c.patch +# KPTI Fixups +Patch639: kpti-fix.patch + +# rhbz1514969, submitted upstream +Patch640: 0001-platform-x86-dell-laptop-Filter-out-spurious-keyboar.patch + +# rhbz1514836, submitted upstream +Patch641: 0001-Bluetooth-btusb-Disable-autosuspend-on-QCA-Rome-devi.patch + # END OF PATCH DEFINITIONS %endif @@ -2218,6 +2227,16 @@ fi # # %changelog +* Thu Jan 04 2018 Hans de Goede <hdegoede@redhat.com> +- Add a patch to filter false positive kbd backlight change events (#1514969) +- Add a patch to disable runtime-pm for QCA bluetooth devices (#1514836) + +* Wed Jan 03 2018 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc6.git0.3 +- Yet another KPTI fix + +* Wed Jan 03 2018 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc6.git0.2 +- KPTI Fix + * Mon Jan 01 2018 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc6.git0.1 - Linux v4.15-rc6 |