6.6-stable patches

added patches:
	drm-amd-display-use-gfp_atomic-in-dc_create_plane_state.patch
	selftests-openvswitch-fix-escape-chars-in-regexp.patch

diff --git a/queue-6.6/drm-amd-display-use-gfp_atomic-in-dc_create_plane_state.patch b/queue-6.6/drm-amd-display-use-gfp_atomic-in-dc_create_plane_state.patch
new file mode 100644 (file)
index 0000000..45bea60
--- /dev/null
+++ b/queue-6.6/drm-amd-display-use-gfp_atomic-in-dc_create_plane_state.patch
@@ -0,0 +1,32 @@
+From 3c41114dcdabb7b25f5bc33273c6db9c7af7f4a7 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Tue, 11 Nov 2025 11:17:22 -0500
+Subject: drm/amd/display: Use GFP_ATOMIC in dc_create_plane_state()
+
+From: Alex Deucher <alexander.deucher@amd.com>
+
+commit 3c41114dcdabb7b25f5bc33273c6db9c7af7f4a7 upstream.
+
+This can get called from an atomic context.
+
+Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4470
+Reviewed-by: Harry Wentland <harry.wentland@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+(cherry picked from commit 8acdad9344cc7b4e7bc01f0dfea80093eb3768db)
+Cc: stable@vger.kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/display/dc/core/dc_surface.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/amd/display/dc/core/dc_surface.c
++++ b/drivers/gpu/drm/amd/display/dc/core/dc_surface.c
+@@ -104,7 +104,7 @@ void enable_surface_flip_reporting(struc
+ struct dc_plane_state *dc_create_plane_state(struct dc *dc)
+ {
+       struct dc_plane_state *plane_state = kvzalloc(sizeof(*plane_state),
+-                                                      GFP_KERNEL);
++                                                      GFP_ATOMIC);
+ 
+       if (NULL == plane_state)
+               return NULL;

diff --git a/queue-6.6/selftests-openvswitch-fix-escape-chars-in-regexp.patch b/queue-6.6/selftests-openvswitch-fix-escape-chars-in-regexp.patch
new file mode 100644 (file)
index 0000000..40a08e9
--- /dev/null
+++ b/queue-6.6/selftests-openvswitch-fix-escape-chars-in-regexp.patch
@@ -0,0 +1,87 @@
+From 3fde60afe1f84746c1177861bd27b3ebb00cb8f5 Mon Sep 17 00:00:00 2001
+From: Adrian Moreno <amorenoz@redhat.com>
+Date: Tue, 16 Apr 2024 11:09:13 +0200
+Subject: selftests: openvswitch: Fix escape chars in regexp.
+
+From: Adrian Moreno <amorenoz@redhat.com>
+
+commit 3fde60afe1f84746c1177861bd27b3ebb00cb8f5 upstream.
+
+Character sequences starting with `\` are interpreted by python as
+escaped Unicode characters. However, they have other meaning in
+regular expressions (e.g: "\d").
+
+It seems Python >= 3.12 starts emitting a SyntaxWarning when these
+escaped sequences are not recognized as valid Unicode characters.
+
+An example of these warnings:
+
+tools/testing/selftests/net/openvswitch/ovs-dpctl.py:505:
+SyntaxWarning: invalid escape sequence '\d'
+
+Fix all the warnings by flagging literals as raw strings.
+
+Signed-off-by: Adrian Moreno <amorenoz@redhat.com>
+Reviewed-by: Aaron Conole <aconole@redhat.com>
+Link: https://lore.kernel.org/r/20240416090913.2028475-1-amorenoz@redhat.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Adrian Yip <adrian.ytw@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/testing/selftests/net/openvswitch/ovs-dpctl.py |   16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+--- a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py
++++ b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py
+@@ -489,7 +489,7 @@ class ovsactions(nla):
+                     actstr, reason = parse_extract_field(
+                         actstr,
+                         "drop(",
+-                        "([0-9]+)",
++                        r"([0-9]+)",
+                         lambda x: int(x, 0),
+                         False,
+                         None,
+@@ -502,9 +502,9 @@ class ovsactions(nla):
+                     actstr = actstr[len("drop"): ]
+                     return (totallen - len(actstr))
+ 
+-            elif parse_starts_block(actstr, "^(\d+)", False, True):
++            elif parse_starts_block(actstr, r"^(\d+)", False, True):
+                 actstr, output = parse_extract_field(
+-                    actstr, None, "(\d+)", lambda x: int(x), False, "0"
++                    actstr, None, r"(\d+)", lambda x: int(x), False, "0"
+                 )
+                 self["attrs"].append(["OVS_ACTION_ATTR_OUTPUT", output])
+                 parsed = True
+@@ -512,7 +512,7 @@ class ovsactions(nla):
+                 actstr, recircid = parse_extract_field(
+                     actstr,
+                     "recirc(",
+-                    "([0-9a-fA-Fx]+)",
++                    r"([0-9a-fA-Fx]+)",
+                     lambda x: int(x, 0),
+                     False,
+                     0,
+@@ -588,17 +588,17 @@ class ovsactions(nla):
+                                 actstr = actstr[3:]
+ 
+                             actstr, ip_block_min = parse_extract_field(
+-                                actstr, "=", "([0-9a-fA-F\.]+)", str, False
++                                actstr, "=", r"([0-9a-fA-F\.]+)", str, False
+                             )
+                             actstr, ip_block_max = parse_extract_field(
+-                                actstr, "-", "([0-9a-fA-F\.]+)", str, False
++                                actstr, "-", r"([0-9a-fA-F\.]+)", str, False
+                             )
+ 
+                             actstr, proto_min = parse_extract_field(
+-                                actstr, ":", "(\d+)", int, False
++                                actstr, ":", r"(\d+)", int, False
+                             )
+                             actstr, proto_max = parse_extract_field(
+-                                actstr, "-", "(\d+)", int, False
++                                actstr, "-", r"(\d+)", int, False
+                             )
+ 
+                             if t is not None:

diff --git a/queue-6.6/series b/queue-6.6/series
index 590d0f26c2b9c0f75b3a1b9ff3358807ccc31739..7ca5d0d2b07201d323a2721aeab098c2230ea144 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -482,3 +482,5 @@ btrfs-don-t-log-conflicting-inode-if-it-s-a-dir-moved-in-the-current-transaction
 s390-ipl-clear-sbp-flag-when-bootprog-is-set.patch
 gpio-regmap-fix-memleak-in-error-path-in-gpio_regmap_register.patch
 io_uring-poll-correctly-handle-io_poll_add-return-value-on-update.patch
+drm-amd-display-use-gfp_atomic-in-dc_create_plane_state.patch
+selftests-openvswitch-fix-escape-chars-in-regexp.patch