summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2022-02-01 17:40:44 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2022-02-01 17:40:44 +0100
commit57a5ca481ca8fc823c3f2a9c53f00dba07dee96c (patch)
treedfca8760be2ae41a2e2dfac7979dcf993568968e
parent6b31909a67ffcc2f840346aa55364debb8622861 (diff)
parent11fd190da202647fb6a2ec81c06c942efd14e8bc (diff)
downloadkernel-57a5ca481ca8fc823c3f2a9c53f00dba07dee96c.tar.gz
kernel-57a5ca481ca8fc823c3f2a9c53f00dba07dee96c.tar.xz
kernel-57a5ca481ca8fc823c3f2a9c53f00dba07dee96c.zip
Merge remote-tracking branch 'origin/stabilization' into stabilization-user-thl-vanilla-fedora
-rwxr-xr-xkernel.spec3
-rw-r--r--patch-5.16-redhat.patch2
-rw-r--r--sources6
3 files changed, 6 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec
index 91a246c66..006ada077 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -2980,7 +2980,8 @@ fi
#
#
%changelog
-* Thu Jan 27 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.3-200]
+* Sat Jan 29 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.4-0]
+- Revert "drm/i915: Flush TLBs before releasing backing store" (Justin M. Forbes)
- Fix up changelog (Justin M. Forbes)
- Add file forgotten in simpledrm revert (Justin M. Forbes)
diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch
index ff458242d..be01419fa 100644
--- a/patch-5.16-redhat.patch
+++ b/patch-5.16-redhat.patch
@@ -45,7 +45,7 @@
44 files changed, 746 insertions(+), 191 deletions(-)
diff --git a/Makefile b/Makefile
-index acb8ffee65dc..d41b475c83d3 100644
+index 36ff4ed4763b..1779878aa037 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
diff --git a/sources b/sources
index 1f62872b7..d42f8959b 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (kernel-abi-whitelists-5.13.3-300.tar.bz2) = 6bf4f456ba178ec95b63b3818d3575773ede221e74fde97bb20eb32409a64c58d4f9a6acce9b8b58a5477d27cb708c53abe03dada02a3bdf1cfd596ccd129294
-SHA512 (linux-5.16.3.tar.xz) = 376adb3b8067870b73e59a4a84cf775b0bcd9e859ace957b96306c85b886cbe0b8d0f0de8e4758ad8588799b823b880f5f213f3128ace807882b1d0ff8aeec3a
-SHA512 (kernel-abi-stablelists-5.16.3-200.tar.bz2) = fbb9473e1aa2ff161066d4e8a980944a226f5ddab77b3d831328c6ee64fa7e823cfac354cb14ce0676107e0a130e043da7bd688bbf2cdfcc28728ddc9da18567
-SHA512 (kernel-kabi-dw-5.16.3-200.tar.bz2) = e07eae3d5ccda7e8b014a8a418e287820f0c826f13b6191683920a100201293f4705b854856314fe23a1d06c70fdf5a4f7f7443e4527d7757660a807b93f7688
+SHA512 (linux-5.16.4.tar.xz) = 4342523d2de004b276ed9a9b2f6004a0ed5875cd523c6cdd3ea9c7b0794c1afd57d1a9c3ad08668a9477caf7972a6bad3d6b07f8ee4ee84335c620b8759c1494
+SHA512 (kernel-abi-stablelists-5.16.4-200.tar.bz2) = f97468052e698997797650dc88744789ea64691af9d86b13f76944f807da5add083174894aa27d99486f4be3208f30beb0d5c9a68472d013eb52d804ab8a6fbe
+SHA512 (kernel-kabi-dw-5.16.4-200.tar.bz2) = e65ba99a3657ad5976ca81a73f9e7c04a9145de36a693a0aa277a06a8ca0d41315a87f380ca5eeff15b2f3aaf17e969d06b9bda78f5287299d1c3559081fd869