diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-17 14:27:28 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-17 14:27:28 +0200 |
| commit | 147c679363dd7e9bd0f8f9ea404c060569e37fee (patch) | |
| tree | ce58cbee01b125ed771f111cec4496e03dcdd3f3 /kernel.spec | |
| parent | fd60ab6e3c383df7f6eccd5ae34cc9661ad00255 (diff) | |
| parent | 47006d595fd71c38f10e7caba99c882cc0ac1d7a (diff) | |
| download | kernel-147c679363dd7e9bd0f8f9ea404c060569e37fee.tar.gz kernel-147c679363dd7e9bd0f8f9ea404c060569e37fee.tar.xz kernel-147c679363dd7e9bd0f8f9ea404c060569e37fee.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.3.0-0.rc0.git6.1.vanilla.knurd.1.fc31kernel-5.3.0-0.rc0.git6.1.vanilla.knurd.1.fc30kernel-5.3.0-0.rc0.git6.1.vanilla.knurd.1.fc29
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index 05e6c72c4..de7cb6058 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 @@ -580,9 +580,6 @@ Patch331: watchdog-bcm2835_wdt-Fix-module-autoload.patch Patch340: arm64-tegra-jetson-tx1-fixes.patch # QCom ACPI device support pieces -# I think both of these may be merged? -# Patch350: arm64-qcom-pinctrl-support-for-ACPI.patch -# Patch352: arm64-acpi-make-ac-and-battery-drivers-available-on-non-x86.patch # 400 - IBM (ppc/s390x) patches @@ -597,6 +594,10 @@ Patch507: 0001-Drop-that-for-now.patch # Submitted upstream at https://lkml.org/lkml/2019/4/23/89 Patch508: KEYS-Make-use-of-platform-keyring-for-module-signature.patch +# rhbz 1716334 +# https://patchwork.kernel.org/patch/11029027/ +Patch509: iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch + # END OF PATCH DEFINITIONS %endif @@ -1838,6 +1839,12 @@ fi # # %changelog +* Wed Jul 17 2019 Laura Abbott <labbott@redhat.com> - 5.3.0-0.rc0.git6.1 +- Linux v5.2-11043-g0a8ad0ffa4d8 + +* Tue Jul 16 2019 Jeremy Cline <jcline@redhat.com> +- Fix a firmware crash in Intel 7000 and 8000 devices (rhbz 1716334) + * Tue Jul 16 2019 Laura Abbott <labbott@redhat.com> - 5.3.0-0.rc0.git5.1 - Linux v5.2-10808-g9637d517347e |