| Message ID | 20231201094705.1ee3cab8@canb.auug.org.au (mailing list archive) |
|---|---|
| State | RFC |
| Delegated to: | BPF |
| Headers | show |
| Series | linux-next: manual merge of the bpf-next tree with the net-next tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
diff --cc Documentation/netlink/specs/netdev.yaml index 20f75b7d3240,00439bcbd2e3..000000000000 --- a/Documentation/netlink/specs/netdev.yaml
Hi all, Today's linux-next merge of the bpf-next tree got a conflict in: Documentation/netlink/specs/netdev.yaml between commit: 839ff60df3ab ("net: page_pool: add nlspec for basic access to page pools") (and a few following) from the net-next tree and commit: 48eb03dd2630 ("xsk: Add TX timestamp and TX checksum offload support") from the bpf-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.