This is a note to let you know that I've just added the patch titled thunderbolt: Use correct type in tb_port_is_clx_enabled() prototype to the 6.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: thunderbolt-use-correct-type-in-tb_port_is_clx_enabled-prototype.patch and it can be found in the queue-6.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From d31137619776f9c173a46a79bc7733a2b106061f Mon Sep 17 00:00:00 2001 From: "Jiri Slaby (SUSE)" <jirislaby@xxxxxxxxxx> Date: Mon, 12 Dec 2022 11:29:36 +0100 Subject: thunderbolt: Use correct type in tb_port_is_clx_enabled() prototype From: Jiri Slaby (SUSE) <jirislaby@xxxxxxxxxx> commit d31137619776f9c173a46a79bc7733a2b106061f upstream. tb_port_is_clx_enabled() generates a valid warning with gcc-13: drivers/thunderbolt/switch.c:1286:6: error: conflicting types for 'tb_port_is_clx_enabled' due to enum/integer mismatch; have 'bool(struct tb_port *, unsigned int)' ... drivers/thunderbolt/tb.h:1050:6: note: previous declaration of 'tb_port_is_clx_enabled' with type 'bool(struct tb_port *, enum tb_clx)' ... I.e. the type of the 2nd parameter of tb_port_is_clx_enabled() in the declaration is unsigned int, while the definition spells enum tb_clx. Synchronize them to the former as the parameter is in fact a mask of the enum values. Signed-off-by: Jiri Slaby (SUSE) <jirislaby@xxxxxxxxxx> Signed-off-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/thunderbolt/tb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/thunderbolt/tb.h +++ b/drivers/thunderbolt/tb.h @@ -1058,7 +1058,7 @@ void tb_port_lane_bonding_disable(struct int tb_port_wait_for_link_width(struct tb_port *port, int width, int timeout_msec); int tb_port_update_credits(struct tb_port *port); -bool tb_port_is_clx_enabled(struct tb_port *port, enum tb_clx clx); +bool tb_port_is_clx_enabled(struct tb_port *port, unsigned int clx); int tb_switch_find_vse_cap(struct tb_switch *sw, enum tb_switch_vse_cap vsec); int tb_switch_find_cap(struct tb_switch *sw, enum tb_switch_cap cap); Patches currently in stable-queue which might be from jirislaby@xxxxxxxxxx are queue-6.1/linux-vt_buffer.h-allow-either-builtin-or-modular-fo.patch queue-6.1/net-wwan-t7xx-do-not-compile-with-werror.patch queue-6.1/bonding-gcc13-synchronize-bond_-a-t-lb_xmit-types.patch queue-6.1/wifi-ath11k-synchronize-ath11k_mac_he_gi_to_nl80211_he_gi-s-return-type.patch queue-6.1/thunderbolt-use-correct-type-in-tb_port_is_clx_enabled-prototype.patch queue-6.1/wireguard-timers-cast-enum-limits-members-to-int-in-prints.patch