Hi Stephen,
On 21/09/2022 03:04, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> tools/testing/selftests/drivers/net/bonding/Makefile
>
> between commit:
>
> bbb774d921e2 ("net: Add tests for bonding and team address list management")
>
> from the net tree and commit:
>
> 152e8ec77640 ("selftests/bonding: add a test for bonding lladdr target")
>
> from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thank you for sharing this fix (and all the others!).
I also had this conflict on my side[1] and I resolved it differently,
more like what is done in the -net tree I think, please see the patch
attached to this email.
I guess I should probably use your version. It is just I saw it after
having resolved the conflict on my side :)
I will check later how the network maintainers will resolve this
conflict and update my tree if needed.
Cheers,
Matt
[1] https://github.com/multipath-tcp/mptcp_net-next/commit/c02e0180887c
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.netdiff --cc tools/testing/selftests/drivers/net/bonding/Makefile
index 0f9659407969,d209f7a98b6c..1ed01e960d51
--- a/tools/testing/selftests/drivers/net/bonding/Makefile
+++ b/tools/testing/selftests/drivers/net/bonding/Makefile
@@@ -1,9 -1,7 +1,10 @@@
# SPDX-License-Identifier: GPL-2.0
# Makefile for net selftests
-TEST_PROGS := bond-break-lacpdu-tx.sh
-TEST_PROGS += bond-lladdr-target.sh
+TEST_PROGS := bond-break-lacpdu-tx.sh \
++ bond-lladdr-target.sh \
+ dev_addr_lists.sh
+
+TEST_FILES := lag_lib.sh
include ../../../lib.mk
