| Message ID | 20220923082306.2468081-1-matthieu.baerts@tessares.net |
|---|---|
| State | Accepted |
| Commit | aacdecda9eb4c65e5ed02c088f8fa4fd50bd327d |
| Headers | show |
| Series | [net-next] selftests/bonding: re-add lladdr target test | expand |
On Fri, Sep 23, 2022 at 10:23:06AM +0200, Matthieu Baerts wrote: > It looks like this test has been accidentally dropped when resolving > conflicts in this Makefile. > > Most probably because there were 3 different patches modifying this file > in parallel: > > commit 152e8ec77640 ("selftests/bonding: add a test for bonding lladdr target") > commit bbb774d921e2 ("net: Add tests for bonding and team address list management") > commit 2ffd57327ff1 ("selftests: bonding: cause oops in bond_rr_gen_slave_id") > > The first one was applied in 'net-next' while the two other ones were > recently applied in the 'net' tree. Thanks for the fix. Before re-post to net-next, I should wait for some more time so lladdr test could be applied to net tree. Hangbin > > But that's alright, easy to fix by re-adding the missing one! > > Fixes: 0140a7168f8b ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net") > Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> > --- > tools/testing/selftests/drivers/net/bonding/Makefile | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/tools/testing/selftests/drivers/net/bonding/Makefile b/tools/testing/selftests/drivers/net/bonding/Makefile > index d14846fcf3d1..e9dab5f9d773 100644 > --- a/tools/testing/selftests/drivers/net/bonding/Makefile > +++ b/tools/testing/selftests/drivers/net/bonding/Makefile > @@ -4,6 +4,7 @@ > TEST_PROGS := \ > bond-arp-interval-causes-panic.sh \ > bond-break-lacpdu-tx.sh \ > + bond-lladdr-target.sh \ > dev_addr_lists.sh > > TEST_FILES := lag_lib.sh > > base-commit: d05d9eb79d0cd0f7a978621b4a56a1f2db444f86 > -- > 2.37.2 >
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Fri, 23 Sep 2022 10:23:06 +0200 you wrote: > It looks like this test has been accidentally dropped when resolving > conflicts in this Makefile. > > Most probably because there were 3 different patches modifying this file > in parallel: > > commit 152e8ec77640 ("selftests/bonding: add a test for bonding lladdr target") > commit bbb774d921e2 ("net: Add tests for bonding and team address list management") > commit 2ffd57327ff1 ("selftests: bonding: cause oops in bond_rr_gen_slave_id") > > [...] Here is the summary with links: - [net-next] selftests/bonding: re-add lladdr target test https://git.kernel.org/netdev/net-next/c/aacdecda9eb4 You are awesome, thank you!
diff --git a/tools/testing/selftests/drivers/net/bonding/Makefile b/tools/testing/selftests/drivers/net/bonding/Makefile index d14846fcf3d1..e9dab5f9d773 100644 --- a/tools/testing/selftests/drivers/net/bonding/Makefile +++ b/tools/testing/selftests/drivers/net/bonding/Makefile @@ -4,6 +4,7 @@ TEST_PROGS := \ bond-arp-interval-causes-panic.sh \ bond-break-lacpdu-tx.sh \ + bond-lladdr-target.sh \ dev_addr_lists.sh TEST_FILES := lag_lib.sh
It looks like this test has been accidentally dropped when resolving conflicts in this Makefile. Most probably because there were 3 different patches modifying this file in parallel: commit 152e8ec77640 ("selftests/bonding: add a test for bonding lladdr target") commit bbb774d921e2 ("net: Add tests for bonding and team address list management") commit 2ffd57327ff1 ("selftests: bonding: cause oops in bond_rr_gen_slave_id") The first one was applied in 'net-next' while the two other ones were recently applied in the 'net' tree. But that's alright, easy to fix by re-adding the missing one! Fixes: 0140a7168f8b ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net") Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> --- tools/testing/selftests/drivers/net/bonding/Makefile | 1 + 1 file changed, 1 insertion(+) base-commit: d05d9eb79d0cd0f7a978621b4a56a1f2db444f86