| Message ID | 20250317193621.4b4db936@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | linux-next: manual merge of the kunit-next tree with the net-next tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
diff --cc lib/Makefile index 66e44569b141,e8fec9defec2..000000000000 --- a/lib/Makefile
Hi all, Today's linux-next merge of the kunit-next tree got a conflict in: lib/Makefile between commit: b341f6fd45ab ("blackhole_dev: convert self-test to KUnit") from the net-next tree and commit: c104c16073b7 ("Kunit to check the longest symbol length") from the kunit-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.