| Message ID | 20220315131348.421dd6c7@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | linux-next: manual merge of the tip tree with the net-next tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
diff --cc arch/x86/net/bpf_jit_comp.c index 6b8de13faf83,b1c736be6545..000000000000 --- a/arch/x86/net/bpf_jit_comp.c
Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/x86/net/bpf_jit_comp.c between commit: 1022a5498f6f ("bpf, x86_64: Use bpf_jit_binary_pack_alloc") from the net-next tree and commit: 9e1db76f44de ("x86,bpf: Fix bpf_arch_text_poke()") from the tip 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.