| Message ID | 20250228144916.3f5905cf@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | linux-next: manual merge of the block tree with the net-next tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
diff --cc tools/testing/selftests/drivers/net/hw/Makefile index cde5814ff9a7,7efc47c89463..000000000000 --- a/tools/testing/selftests/drivers/net/hw/Makefile
Hi all, Today's linux-next merge of the block tree got a conflict in: tools/testing/selftests/drivers/net/hw/Makefile between commit: 185646a8a0a8 ("selftests: drv-net: add tests for napi IRQ affinity notifiers") from the net-next tree and commit: 71082faa2c64 ("io_uring/zcrx: add selftest") from the block 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.