drop 4.19 drm amd comment patch

diff --git a/queue-4.19/drm-amd-dm-understand-why-attaching-path-tile-properties-are-needed.patch b/queue-4.19/drm-amd-dm-understand-why-attaching-path-tile-properties-are-needed.patch
deleted file mode 100644 (file)
index 277faf4..0000000
--- a/queue-4.19/drm-amd-dm-understand-why-attaching-path-tile-properties-are-needed.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 04ac4b0ed412f65230b456fcd9aa07e13befff89 Mon Sep 17 00:00:00 2001
-From: Lyude Paul <lyude@redhat.com>
-Date: Mon, 19 Nov 2018 19:44:55 +0000
-Subject: drm/amd/dm: Understand why attaching path/tile properties are needed
-
-From: Lyude Paul <lyude@redhat.com>
-
-commit 04ac4b0ed412f65230b456fcd9aa07e13befff89 upstream.
-
-Path property is used for userspace to know what MST connector goes to what actual DRM DisplayPort connector, the tiling property is for tiling configurations. Not sure what else there is to figure out.
-
-Signed-off-by: Lyude Paul <lyude@redhat.com>
-Reviewed-by: Jerry (Fangzhi) Zuo <Jerry.Zuo@amd.com>
-Cc: Stable <stable@vger.kernel.org>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c |    3 ---
- 1 file changed, 3 deletions(-)
-
---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
-+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
-@@ -377,9 +377,6 @@ dm_dp_add_mst_connector(struct drm_dp_ms
-       drm_connector_attach_encoder(&aconnector->base,
-                                    &aconnector->mst_encoder->base);
- 
--      /*
--       * TODO: understand why this one is needed
--       */
-       drm_object_attach_property(
-               &connector->base,
-               dev->mode_config.path_property,

diff --git a/queue-4.19/series b/queue-4.19/series
index b68896652d14d630c528502799dbdb6baa171a34..28b6bcd4ab2732518d6fad86059ae0a51719d422 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -13,7 +13,6 @@ ib-mlx5-avoid-load-failure-due-to-unknown-link-width.patch
 tracing-fgraph-fix-set_graph_function-from-showing-interrupts.patch
 drm-ast-fix-incorrect-free-on-ioregs.patch
 drm-amd-dm-don-t-forget-to-attach-mst-encoders.patch
-drm-amd-dm-understand-why-attaching-path-tile-properties-are-needed.patch
 drm-set-is_master-to-0-upon-drm_new_set_master-failure.patch
 drm-meson-fixes-for-drm_crtc_vblank_on-off-support.patch
 drm-meson-enable-fast_io-in-meson_dw_hdmi_regmap_config.patch

diff --git a/queue-4.19/tipc-use-destination-length-for-copy-string.patch b/queue-4.19/tipc-use-destination-length-for-copy-string.patch
index dc1ff7ff51f23a499bde5c3cf1361e5ca120af65..97dd4dcb8746bea4bb760c6213eb4afc9607f04f 100644 (file)
--- a/queue-4.19/tipc-use-destination-length-for-copy-string.patch
+++ b/queue-4.19/tipc-use-destination-length-for-copy-string.patch
@@ -26,11 +26,13 @@ Acked-by: Ying Xue <ying.xue@windriver.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
-diff --git a/net/tipc/topsrv.c b/net/tipc/topsrv.c
-index d8956f7daac4..4bdea0057171 100644
+---
+ net/tipc/topsrv.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/net/tipc/topsrv.c
 +++ b/net/tipc/topsrv.c
-@@ -651,7 +651,7 @@ int tipc_topsrv_start(struct net *net)
+@@ -657,7 +657,7 @@ int tipc_topsrv_start(struct net *net)
        srv->max_rcvbuf_size = sizeof(struct tipc_subscr);
        INIT_WORK(&srv->awork, tipc_topsrv_accept);