| Message ID | 20200423114313.634bf6cd@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 kbuild-current tree | expand |
diff --cc include/linux/vermagic.h index dc236577b92f,7768d20ada39..000000000000 --- a/include/linux/vermagic.h
Hi all, Today's linux-next merge of the net-next tree got a conflict in: include/linux/vermagic.h between commit: e3459da6c363 ("arch: split MODULE_ARCH_VERMAGIC definitions out to <asm/vermagic.h>") from the kbuild-current tree and commit: 51161bfc66a6 ("kernel/module: Hide vermagic header file from general use") 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.