From: Jakub Kicinski Date: Thu, 8 Dec 2022 04:17:35 +0000 (-0800) Subject: Merge branch 'net-ethernet-ti-am65-cpsw-fix-set-channel-operation' X-Git-Tag: v6.2-rc1~99^2~51 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8b879c00f69a22738f6bb7198e763cfcc6b68f8;p=thirdparty%2Flinux.git Merge branch 'net-ethernet-ti-am65-cpsw-fix-set-channel-operation' Roger Quadros says: ==================== net: ethernet: ti: am65-cpsw: Fix set channel operation This contains a critical bug fix for the recently merged suspend/resume support [1] that broke set channel operation. (ethtool -L eth0 tx ) As there were 2 dependent patches on top of the offending commit [1] first revert them and then apply them back after the correct fix. [1] fd23df72f2be ("net: ethernet: ti: am65-cpsw: Add suspend/resume support") ==================== Link: https://lore.kernel.org/r/20221206094419.19478-1-rogerq@kernel.org Signed-off-by: Jakub Kicinski --- d8b879c00f69a22738f6bb7198e763cfcc6b68f8