[ 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: 3fff5da4ca2164bb4d0f1e6cd33f6eb8a0e73e50
WARNING: Author mismatch between patch and upstream commit: Backport author: Alexey Panovapanov@astralinux.ru Commit author: Octavian Purdilatavip@google.com
Status in newer kernel trees: 6.13.y | Present (different SHA1: d9bce1310c0e) 6.12.y | Present (different SHA1: 1bb06f919fa5) 6.6.y | Present (different SHA1: 184a564e6000) 6.1.y | Present (different SHA1: adff6ac889e1) 5.15.y | Present (different SHA1: 32f50326827e) 5.4.y | Present (different SHA1: f29d32fd102d)
Note: The patch differs from the upstream commit: --- 1: 3fff5da4ca216 ! 1: 2cf7fffdad4c3 team: prevent adding a device which is already a team device lower @@ Metadata ## Commit message ## team: prevent adding a device which is already a team device lower
+ commit 3fff5da4ca2164bb4d0f1e6cd33f6eb8a0e73e50 upstream. + Prevent adding a device which is already a team device lower, e.g. adding veth0 if vlan1 was already added and veth0 is a lower of vlan1. @@ Commit message Signed-off-by: Octavian Purdila tavip@google.com Reviewed-by: Hangbin Liu liuhangbin@gmail.com Signed-off-by: David S. Miller davem@davemloft.net + [Alexey: fixed path from team_core.c to team.c to resolve merge conflict] + Signed-off-by: Alexey Panov apanov@astralinux.ru
- ## drivers/net/team/team_core.c ## -@@ drivers/net/team/team_core.c: static int team_port_add(struct team *team, struct net_device *port_dev, + ## drivers/net/team/team.c ## +@@ drivers/net/team/team.c: static int team_port_add(struct team *team, struct net_device *port_dev, return -EBUSY; }
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-5.10.y | Success | Success | | stable/linux-5.15.y | Success | Success |