diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-09-24 20:01:36 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-09-24 20:01:36 +0200 |
commit | 07fd8b8b3b66120a810b984aea06f77681e68b6a (patch) | |
tree | 1624219b2532244918b005925cf7ad523dc8c34a /kernel.spec | |
parent | 91f5d14ede5cf81401453a2720c7b23a1a8b4f8a (diff) | |
parent | 84b9af49ccf61cca3fd58645a062be70812db7c1 (diff) | |
download | kernel-07fd8b8b3b66120a810b984aea06f77681e68b6a.tar.gz kernel-07fd8b8b3b66120a810b984aea06f77681e68b6a.tar.xz kernel-07fd8b8b3b66120a810b984aea06f77681e68b6a.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.4.0-0.rc0.git6.1.vanilla.knurd.1.fc32kernel-5.4.0-0.rc0.git6.1.vanilla.knurd.1.fc31kernel-5.4.0-0.rc0.git6.1.vanilla.knurd.1.fc30kernel-5.4.0-0.rc0.git6.1.vanilla.knurd.1.fc29
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index b835f7273..35f03b9ca 100644 --- a/kernel.spec +++ b/kernel.spec @@ -79,7 +79,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 5 +%define gitrev 6 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -562,11 +562,14 @@ Patch330: arm64-qcom-i2c-geni-Disable-DMA-processing-on-the-Lenovo-Yoga-C630.pat Patch501: input-rmi4-remove-the-need-for-artifical-IRQ.patch # gcc9 fixes -Patch507: 0001-Drop-that-for-now.patch +Patch502: 0001-Drop-that-for-now.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1701096 # Submitted upstream at https://lkml.org/lkml/2019/4/23/89 -Patch508: KEYS-Make-use-of-platform-keyring-for-module-signature.patch +Patch503: KEYS-Make-use-of-platform-keyring-for-module-signature.patch + +# https://patchwork.kernel.org/patch/11158395/ +Patch504: iwlwifi-fw-don-t-send-GEO_TX_POWER_LIMIT-command-to-FW-version-36.patch # END OF PATCH DEFINITIONS @@ -1772,6 +1775,9 @@ fi # # %changelog +* Tue Sep 24 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc0.git6.1 +- Linux v5.3-12025-g4c07e2ddab5b + * Mon Sep 23 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc0.git5.1 - Linux v5.3-11768-g619e17cf75dd |