drop typec patch

diff --git a/queue-5.10/series b/queue-5.10/series
index c3b6ca55352910bf096a64ec0828ea6119c37567..c2ae51e021507ab32aa58dd8971a890893818725 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -95,7 +95,6 @@ usb-storage-add-quirks-for-pny-elite-portable-ssd.patch
 usbip-vudc-fix-use-after-free-bug-in-vudc_remove-due-to-race-condition.patch
 usb-usbtmc-check-urb-actual_length-for-interrupt-in-notifications.patch
 usb-usbtmc-reject-interrupt-endpoints-with-small-wmaxpacketsize.patch
-usb-typec-ucsi-don-t-update-power_supply-on-power-role-change-if-not-connected.patch
 usb-serial-option-add-meig-srm813q.patch
 usb-serial-option-add-missing-rsvd-5-flag-for-rolling-rw135r-gl.patch
 usb-serial-belkin_sa-validate-interrupt-status-length.patch

diff --git a/queue-5.10/usb-typec-ucsi-don-t-update-power_supply-on-power-role-change-if-not-connected.patch b/queue-5.10/usb-typec-ucsi-don-t-update-power_supply-on-power-role-change-if-not-connected.patch
deleted file mode 100644 (file)
index 14a611f..0000000
--- a/queue-5.10/usb-typec-ucsi-don-t-update-power_supply-on-power-role-change-if-not-connected.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d98d413ca65d0790a8f3695d0a5845538958ab84 Mon Sep 17 00:00:00 2001
-From: Myrrh Periwinkle <myrrhperiwinkle@qtmlabs.xyz>
-Date: Tue, 19 May 2026 18:41:40 +0700
-Subject: usb: typec: ucsi: Don't update power_supply on power role change if not connected
-
-From: Myrrh Periwinkle <myrrhperiwinkle@qtmlabs.xyz>
-
-commit d98d413ca65d0790a8f3695d0a5845538958ab84 upstream.
-
-We only need to update the power_supply on power role change if the port
-is connected, because otherwise the online status should be the same for
-both cases.
-
-Cc: stable <stable@kernel.org>
-Fixes: 7616f006db07 ("usb: typec: ucsi: Update power_supply on power role change")
-Signed-off-by: Myrrh Periwinkle <myrrhperiwinkle@qtmlabs.xyz>
-Reported-and-tested-by: Sergey Senozhatsky <senozhatsky@chromium.org>
-Link: https://patch.msgid.link/20260519-ucsi-fix-2-v1-2-6f1239535187@qtmlabs.xyz
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/usb/typec/ucsi/ucsi.c |    7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
---- a/drivers/usb/typec/ucsi/ucsi.c
-+++ b/drivers/usb/typec/ucsi/ucsi.c
-@@ -779,7 +779,12 @@ static void ucsi_handle_connector_change
- 
-       if (con->status.change & UCSI_CONSTAT_CONNECT_CHANGE) {
-               typec_set_pwr_role(con->port, role);
--              ucsi_port_psy_changed(con);
-+
-+              /* Some power_supply properties vary depending on the power direction when
-+               * connected
-+               */
-+              if (UCSI_CONSTAT(con, CONNECTED))
-+                      ucsi_port_psy_changed(con);
- 
-               switch (UCSI_CONSTAT_PARTNER_TYPE(con->status.flags)) {
-               case UCSI_CONSTAT_PARTNER_TYPE_UFP:

diff --git a/queue-5.15/series b/queue-5.15/series
index ba368ebd87ab419915c8a5219639f018cf35c4c4..ca649ea2220dc6b0f718ab601e7b92d9b26d52bf 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -112,7 +112,6 @@ usb-storage-add-quirks-for-pny-elite-portable-ssd.patch
 usbip-vudc-fix-use-after-free-bug-in-vudc_remove-due-to-race-condition.patch
 usb-usbtmc-check-urb-actual_length-for-interrupt-in-notifications.patch
 usb-usbtmc-reject-interrupt-endpoints-with-small-wmaxpacketsize.patch
-usb-typec-ucsi-don-t-update-power_supply-on-power-role-change-if-not-connected.patch
 usb-serial-option-add-meig-srm813q.patch
 usb-serial-option-add-missing-rsvd-5-flag-for-rolling-rw135r-gl.patch
 usb-serial-belkin_sa-validate-interrupt-status-length.patch

diff --git a/queue-5.15/usb-typec-ucsi-don-t-update-power_supply-on-power-role-change-if-not-connected.patch b/queue-5.15/usb-typec-ucsi-don-t-update-power_supply-on-power-role-change-if-not-connected.patch
deleted file mode 100644 (file)
index 29576c9..0000000
--- a/queue-5.15/usb-typec-ucsi-don-t-update-power_supply-on-power-role-change-if-not-connected.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d98d413ca65d0790a8f3695d0a5845538958ab84 Mon Sep 17 00:00:00 2001
-From: Myrrh Periwinkle <myrrhperiwinkle@qtmlabs.xyz>
-Date: Tue, 19 May 2026 18:41:40 +0700
-Subject: usb: typec: ucsi: Don't update power_supply on power role change if not connected
-
-From: Myrrh Periwinkle <myrrhperiwinkle@qtmlabs.xyz>
-
-commit d98d413ca65d0790a8f3695d0a5845538958ab84 upstream.
-
-We only need to update the power_supply on power role change if the port
-is connected, because otherwise the online status should be the same for
-both cases.
-
-Cc: stable <stable@kernel.org>
-Fixes: 7616f006db07 ("usb: typec: ucsi: Update power_supply on power role change")
-Signed-off-by: Myrrh Periwinkle <myrrhperiwinkle@qtmlabs.xyz>
-Reported-and-tested-by: Sergey Senozhatsky <senozhatsky@chromium.org>
-Link: https://patch.msgid.link/20260519-ucsi-fix-2-v1-2-6f1239535187@qtmlabs.xyz
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/usb/typec/ucsi/ucsi.c |    7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
---- a/drivers/usb/typec/ucsi/ucsi.c
-+++ b/drivers/usb/typec/ucsi/ucsi.c
-@@ -793,7 +793,12 @@ static void ucsi_handle_connector_change
- 
-       if (con->status.change & UCSI_CONSTAT_CONNECT_CHANGE) {
-               typec_set_pwr_role(con->port, role);
--              ucsi_port_psy_changed(con);
-+
-+              /* Some power_supply properties vary depending on the power direction when
-+               * connected
-+               */
-+              if (UCSI_CONSTAT(con, CONNECTED))
-+                      ucsi_port_psy_changed(con);
- 
-               switch (UCSI_CONSTAT_PARTNER_TYPE(con->status.flags)) {
-               case UCSI_CONSTAT_PARTNER_TYPE_UFP:

diff --git a/queue-6.1/series b/queue-6.1/series
index 8ea33518547e3b8f477fdd6dbea03de5c797a890..6687d865a182ec46c5fd8c9c3968e81c415f5407 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -148,7 +148,6 @@ usb-storage-add-quirks-for-pny-elite-portable-ssd.patch
 usbip-vudc-fix-use-after-free-bug-in-vudc_remove-due-to-race-condition.patch
 usb-usbtmc-check-urb-actual_length-for-interrupt-in-notifications.patch
 usb-usbtmc-reject-interrupt-endpoints-with-small-wmaxpacketsize.patch
-usb-typec-ucsi-don-t-update-power_supply-on-power-role-change-if-not-connected.patch
 usb-serial-option-add-meig-srm813q.patch
 usb-serial-option-add-missing-rsvd-5-flag-for-rolling-rw135r-gl.patch
 usb-serial-belkin_sa-validate-interrupt-status-length.patch

diff --git a/queue-6.1/usb-typec-ucsi-don-t-update-power_supply-on-power-role-change-if-not-connected.patch b/queue-6.1/usb-typec-ucsi-don-t-update-power_supply-on-power-role-change-if-not-connected.patch
deleted file mode 100644 (file)
index 9511c6b..0000000
--- a/queue-6.1/usb-typec-ucsi-don-t-update-power_supply-on-power-role-change-if-not-connected.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d98d413ca65d0790a8f3695d0a5845538958ab84 Mon Sep 17 00:00:00 2001
-From: Myrrh Periwinkle <myrrhperiwinkle@qtmlabs.xyz>
-Date: Tue, 19 May 2026 18:41:40 +0700
-Subject: usb: typec: ucsi: Don't update power_supply on power role change if not connected
-
-From: Myrrh Periwinkle <myrrhperiwinkle@qtmlabs.xyz>
-
-commit d98d413ca65d0790a8f3695d0a5845538958ab84 upstream.
-
-We only need to update the power_supply on power role change if the port
-is connected, because otherwise the online status should be the same for
-both cases.
-
-Cc: stable <stable@kernel.org>
-Fixes: 7616f006db07 ("usb: typec: ucsi: Update power_supply on power role change")
-Signed-off-by: Myrrh Periwinkle <myrrhperiwinkle@qtmlabs.xyz>
-Reported-and-tested-by: Sergey Senozhatsky <senozhatsky@chromium.org>
-Link: https://patch.msgid.link/20260519-ucsi-fix-2-v1-2-6f1239535187@qtmlabs.xyz
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/usb/typec/ucsi/ucsi.c |    7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
---- a/drivers/usb/typec/ucsi/ucsi.c
-+++ b/drivers/usb/typec/ucsi/ucsi.c
-@@ -806,7 +806,12 @@ static void ucsi_handle_connector_change
- 
-       if (con->status.change & UCSI_CONSTAT_POWER_DIR_CHANGE) {
-               typec_set_pwr_role(con->port, role);
--              ucsi_port_psy_changed(con);
-+
-+              /* Some power_supply properties vary depending on the power direction when
-+               * connected
-+               */
-+              if (UCSI_CONSTAT(con, CONNECTED))
-+                      ucsi_port_psy_changed(con);
- 
-               /* Complete pending power role swap */
-               if (!completion_done(&con->complete))

diff --git a/queue-6.6/series b/queue-6.6/series
index 304b1ec6e9465bb916d3a0b66b57dbb533303e78..c84d96a748fc97ed5a1de148fd4b553485a5fdce 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -156,7 +156,6 @@ usb-storage-add-quirks-for-pny-elite-portable-ssd.patch
 usbip-vudc-fix-use-after-free-bug-in-vudc_remove-due-to-race-condition.patch
 usb-usbtmc-check-urb-actual_length-for-interrupt-in-notifications.patch
 usb-usbtmc-reject-interrupt-endpoints-with-small-wmaxpacketsize.patch
-usb-typec-ucsi-don-t-update-power_supply-on-power-role-change-if-not-connected.patch
 usb-serial-option-add-meig-srm813q.patch
 usb-serial-option-add-missing-rsvd-5-flag-for-rolling-rw135r-gl.patch
 usb-serial-belkin_sa-validate-interrupt-status-length.patch

diff --git a/queue-6.6/usb-typec-ucsi-don-t-update-power_supply-on-power-role-change-if-not-connected.patch b/queue-6.6/usb-typec-ucsi-don-t-update-power_supply-on-power-role-change-if-not-connected.patch
deleted file mode 100644 (file)
index 598f172..0000000
--- a/queue-6.6/usb-typec-ucsi-don-t-update-power_supply-on-power-role-change-if-not-connected.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d98d413ca65d0790a8f3695d0a5845538958ab84 Mon Sep 17 00:00:00 2001
-From: Myrrh Periwinkle <myrrhperiwinkle@qtmlabs.xyz>
-Date: Tue, 19 May 2026 18:41:40 +0700
-Subject: usb: typec: ucsi: Don't update power_supply on power role change if not connected
-
-From: Myrrh Periwinkle <myrrhperiwinkle@qtmlabs.xyz>
-
-commit d98d413ca65d0790a8f3695d0a5845538958ab84 upstream.
-
-We only need to update the power_supply on power role change if the port
-is connected, because otherwise the online status should be the same for
-both cases.
-
-Cc: stable <stable@kernel.org>
-Fixes: 7616f006db07 ("usb: typec: ucsi: Update power_supply on power role change")
-Signed-off-by: Myrrh Periwinkle <myrrhperiwinkle@qtmlabs.xyz>
-Reported-and-tested-by: Sergey Senozhatsky <senozhatsky@chromium.org>
-Link: https://patch.msgid.link/20260519-ucsi-fix-2-v1-2-6f1239535187@qtmlabs.xyz
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/usb/typec/ucsi/ucsi.c |    7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
---- a/drivers/usb/typec/ucsi/ucsi.c
-+++ b/drivers/usb/typec/ucsi/ucsi.c
-@@ -910,7 +910,12 @@ static void ucsi_handle_connector_change
- 
-       if (con->status.change & UCSI_CONSTAT_POWER_DIR_CHANGE) {
-               typec_set_pwr_role(con->port, role);
--              ucsi_port_psy_changed(con);
-+
-+              /* Some power_supply properties vary depending on the power direction when
-+               * connected
-+               */
-+              if (UCSI_CONSTAT(con, CONNECTED))
-+                      ucsi_port_psy_changed(con);
- 
-               /* Complete pending power role swap */
-               if (!completion_done(&con->complete))