| Message ID | 20220321174301.3a1b3943@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | linux-next: manual merge of the rust tree with the bpf-next tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
diff --cc samples/Makefile index 701e912ab5af,fc5e9760ea32..000000000000 --- a/samples/Makefile
Hi all, Today's linux-next merge of the rust tree got a conflict in: samples/Makefile between commit: 6ee64cc3020b ("fprobe: Add sample program for fprobe") from the bpf-next tree and commit: 44d687f85cc3 ("samples: add Rust examples") from the rust 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.