diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-08 06:50:36 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-08 06:50:36 +0200 |
commit | cc879c0344f54c1231d3cf0ee8fa7a224a750d74 (patch) | |
tree | cc7f4047efc24e8c8a4a94a8165301e5fa77261d /kernel.spec | |
parent | 47c8f95f3de11af5221a8527d818a0f9b88346c0 (diff) | |
parent | ff84cb1dd72c40e8679c0122c4a8bb3c235f6b16 (diff) | |
download | kernel-cc879c0344f54c1231d3cf0ee8fa7a224a750d74.tar.gz kernel-cc879c0344f54c1231d3cf0ee8fa7a224a750d74.tar.xz kernel-cc879c0344f54c1231d3cf0ee8fa7a224a750d74.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc0.git7.1.vanilla.knurd.1.fc33kernel-5.7.0-0.rc0.git7.1.vanilla.knurd.1.fc32kernel-5.7.0-0.rc0.git7.1.vanilla.knurd.1.fc31kernel-5.7.0-0.rc0.git7.1.vanilla.knurd.1.fc30
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec index 851259826..df5a75313 100644 --- a/kernel.spec +++ b/kernel.spec @@ -115,7 +115,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 6 +%define gitrev 7 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -838,20 +838,17 @@ Patch304: ARM-tegra-usb-no-reset.patch # Raspberry Pi # v5 https://patchwork.kernel.org/cover/11429245/ -Patch311: USB-pci-quirks-Add-Raspberry-Pi-4-quirk.patch +Patch310: USB-pci-quirks-Add-Raspberry-Pi-4-quirk.patch # Tegra bits # http://patchwork.ozlabs.org/patch/1243112/ -Patch325: backlight-lp855x-Ensure-regulators-are-disabled-on-probe-failure.patch +Patch320: backlight-lp855x-Ensure-regulators-are-disabled-on-probe-failure.patch # https://patchwork.ozlabs.org/patch/1261638/ -Patch326: arm64-drm-tegra-Fix-SMMU-support-on-Tegra124-and-Tegra210.patch - -# Coral +Patch321: arm64-drm-tegra-Fix-SMMU-support-on-Tegra124-and-Tegra210.patch # Pine64 bits -# 340-345 queued for 5.7 # https://patchwork.kernel.org/cover/11440399/ -Patch346: Add-support-for-PinePhone-LCD-panel.patch +Patch330: Add-support-for-PinePhone-LCD-panel.patch # 400 - IBM (ppc/s390x) patches @@ -885,6 +882,12 @@ Patch511: 0001-ALSA-hda-realtek-Add-quirk-for-Lenovo-Carbon-X1-8th-.patch # Fixes build on s390 and should be upstream after rc1 Patch512: export_sysrq_mask.patch +# nouveau runpm and secboot fixes +# Accepted nouveau upstream https://github.com/skeggsb/nouveau/commit/f5755e7069d4acbcce1a93692421f358241ead7b +Patch513: 0001-drm-nouveau-workaround-runpm-fail-by-disabling-PCI-p.patch +# Accepted nouveau upstream https://github.com/skeggsb/nouveau/commit/41c6a13e8143af71928749ea9895d2ebc2fb4ffd +Patch514: 0002-drm-nouveau-gr-gp107-gp108-implement-workaround-for-.patch + # END OF PATCH DEFINITIONS %endif @@ -2983,6 +2986,12 @@ fi # # %changelog +* Tue Apr 07 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.7.0-0.rc0.git7.1 +- Linux v5.6-11448-g7e63420847ae + +* Tue Apr 07 2020 Karol Herbst <kherbst@redhat.com> +- Add patches to fix nouveau issues preventing booting the installer or system + * Mon Apr 06 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.7.0-0.rc0.git6.1 - Linux v5.6-11374-ga10c9c710f9e |