| Message ID | 20200729132050.10527ff1@canb.auug.org.au |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | linux-next: manual merge of the net-next tree with the risc-v tree | expand |
diff --cc lib/Kconfig index 610c16ecbb7c,3ffbca6998e5..000000000000 --- a/lib/Kconfig
Hi all, Today's linux-next merge of the net-next tree got a conflict in: lib/Kconfig between commit: 1a479f783857 ("lib: Add a generic version of devmem_is_allowed()") from the risc-v tree and commit: b8265621f488 ("Add pldmfw library for PLDM firmware update") from the net-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.