summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2019-12-18 07:54:27 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2019-12-18 07:54:27 +0100
commit5c75657774ec3ef716d94a6aef1818713cc36450 (patch)
treeaa384579a199423ac89262f13441d9dd47e526aa /kernel.spec
parent547126255b8e092644356f10887c4b60391f2f5b (diff)
parent099b513168f8fd11aa838ece0769cdadb16569c6 (diff)
downloadkernel-5c75657774ec3ef716d94a6aef1818713cc36450.tar.gz
kernel-5c75657774ec3ef716d94a6aef1818713cc36450.tar.xz
kernel-5c75657774ec3ef716d94a6aef1818713cc36450.zip
Merge remote-tracking branch 'origin/stabilization' into stabilization-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec7
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index b53570a1a..e3fc5ec3e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -882,6 +882,10 @@ Patch600: alsa-5.5.patch
# ALSA code from v5.6 (Intel ASoC Sound Open Firmware driver support)
Patch607: alsa-5.6.patch
+# rhbz 1706557, both patches are upstream in v5.5-rc2
+Patch608: 0001-drm-nouveau-Move-the-declaration-of-struct-nouveau_c.patch
+Patch609: 0002-drm-nouveau-Fix-drm-core-using-atomic-code-paths-on-.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -2586,6 +2590,9 @@ fi
#
#
%changelog
+* Tue Dec 17 2019 Hans de Goede <hdegoede@redhat.com>
+- Add 2 patches from 5.5 to fix some nouveau issues (rhbz#1706557)
+
* Fri Dec 13 2019 Jeremy Cline <jcline@redhat.com> - 5.4.3-300
- Linux v5.4.3