| Message ID | 20220203145229.13dd25e9@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | BPF |
| Headers | show |
| Series | linux-next: manual merge of the akpm-current tree with the bpf-next tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
diff --cc lib/Kconfig.debug index f15dd96028b5,efc1a1908e04..000000000000 --- a/lib/Kconfig.debug
Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: lib/Kconfig.debug between commit: 42d9b379e3e1 ("lib/Kconfig.debug: Allow BTF + DWARF5 with pahole 1.21+") from the bpf-next tree and commit: e11ef20106b7 ("Kconfig.debug: make DEBUG_INFO selectable from a choice") from the akpm-current 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.