commit: e34935903a16b99858637aa512f86cf98188f4f7 Author: Alice Ferrazzi <alicef <AT> gentoo <DOT> org> AuthorDate: Sun Mar 12 12:29:37 2023 +0000 Commit: Alice Ferrazzi <alicef <AT> gentoo <DOT> org> CommitDate: Sun Mar 12 12:29:37 2023 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=e3493590
Linux patch 5.15.101 Signed-off-by: Alice Ferrazzi <alicef <AT> gentoo.org> 0000_README | 4 ++++ 1100_linux-5.15.101.patch | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/0000_README b/0000_README index 34bd5f9c..e7c4aeb3 100644 --- a/0000_README +++ b/0000_README @@ -443,6 +443,10 @@ Patch: 1099_linux-5.15.100.patch From: https://www.kernel.org Desc: Linux 5.15.100 +Patch: 1100_linux-5.15.101.patch +From: https://www.kernel.org +Desc: Linux 5.15.101 + Patch: 1500_XATTR_USER_PREFIX.patch From: https://bugs.gentoo.org/show_bug.cgi?id=470644 Desc: Support for namespace user.pax.* on tmpfs. diff --git a/1100_linux-5.15.101.patch b/1100_linux-5.15.101.patch new file mode 100644 index 00000000..f0c7e1cc --- /dev/null +++ b/1100_linux-5.15.101.patch @@ -0,0 +1,35 @@ +diff --git a/Makefile b/Makefile +index ef2defa6bce23..2db3f373b81ea 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 + VERSION = 5 + PATCHLEVEL = 15 +-SUBLEVEL = 100 ++SUBLEVEL = 101 + EXTRAVERSION = + NAME = Trick or Treat + +diff --git a/drivers/gpu/drm/i915/gt/intel_ring.c b/drivers/gpu/drm/i915/gt/intel_ring.c +index 6499f8ba953a8..7c4d5158e03bb 100644 +--- a/drivers/gpu/drm/i915/gt/intel_ring.c ++++ b/drivers/gpu/drm/i915/gt/intel_ring.c +@@ -51,7 +51,7 @@ int intel_ring_pin(struct intel_ring *ring, struct i915_gem_ww_ctx *ww) + if (unlikely(ret)) + goto err_unpin; + +- if (i915_vma_is_map_and_fenceable(vma) && !HAS_LLC(vma->vm->i915)) { ++ if (i915_vma_is_map_and_fenceable(vma)) { + addr = (void __force *)i915_vma_pin_iomap(vma); + } else { + int type = i915_coherent_map_type(vma->vm->i915, vma->obj, false); +@@ -96,7 +96,7 @@ void intel_ring_unpin(struct intel_ring *ring) + return; + + i915_vma_unset_ggtt_write(vma); +- if (i915_vma_is_map_and_fenceable(vma) && !HAS_LLC(vma->vm->i915)) ++ if (i915_vma_is_map_and_fenceable(vma)) + i915_vma_unpin_iomap(vma); + else + i915_gem_object_unpin_map(vma->obj);
