Messages in this thread | | | Date | Sat, 4 Apr 2020 10:13:14 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the csky tree with Linus' tree |
| |
Hi all,
Today's linux-next merge of the csky tree got a conflict in:
arch/csky/include/asm/Kbuild
between commit:
630f289b7114 ("asm-generic: make more kernel-space headers mandatory")
from Linus' tree and commit:
33e53ae1ce41 ("csky: Add kprobes supported")
from the csky tree.
I fixed it up (the former is a superset of the latter) 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.
-- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |