[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected. No action required from the submitter.
The upstream commit SHA1 provided is correct: c2e0c58b25a0a0c37ec643255558c5af4450c9f5
WARNING: Author mismatch between patch and upstream commit: Backport author: Feng LiuFeng.Liu3@windriver.com Commit author: Wei Fangwei.fang@nxp.com
Status in newer kernel trees: 6.14.y | Present (exact SHA1) 6.12.y | Present (exact SHA1) 6.6.y | Present (different SHA1: d38625f71950) 6.1.y | Present (different SHA1: e2348d8c61d0)
Note: The patch differs from the upstream commit: --- 1: c2e0c58b25a0a ! 1: a32e7777c7358 net: fec: remove .ndo_poll_controller to avoid deadlocks @@ Metadata ## Commit message ## net: fec: remove .ndo_poll_controller to avoid deadlocks
+ [ Upstream commit c2e0c58b25a0a0c37ec643255558c5af4450c9f5 ] + There is a deadlock issue found in sungem driver, please refer to the commit ac0a230f719b ("eth: sungem: remove .ndo_poll_controller to avoid deadlocks"). The root cause of the issue is that netpoll is in atomic @@ Commit message Signed-off-by: Wei Fang wei.fang@nxp.com Link: https://lore.kernel.org/r/20240511062009.652918-1-wei.fang@nxp.com Signed-off-by: Jakub Kicinski kuba@kernel.org + [Minor context change fixed] + Signed-off-by: Feng Liu Feng.Liu3@windriver.com + Signed-off-by: He Zhe Zhe.He@windriver.com
## drivers/net/ethernet/freescale/fec_main.c ## @@ drivers/net/ethernet/freescale/fec_main.c: fec_set_mac_address(struct net_device *ndev, void *p) @@ drivers/net/ethernet/freescale/fec_main.c: fec_set_mac_address(struct net_device @@ drivers/net/ethernet/freescale/fec_main.c: static const struct net_device_ops fec_netdev_ops = { .ndo_tx_timeout = fec_timeout, .ndo_set_mac_address = fec_set_mac_address, - .ndo_eth_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = fec_enet_ioctl, -#ifdef CONFIG_NET_POLL_CONTROLLER - .ndo_poll_controller = fec_poll_controller, -#endif .ndo_set_features = fec_set_features, - .ndo_bpf = fec_enet_bpf, - .ndo_xdp_xmit = fec_enet_xdp_xmit, + }; + ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-5.15.y | Success | Success |