Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
drivers/misc/lkdtm_core.c
between commit:
8776fe75dc0e ("lkdtm, kprobes: Convert from jprobes to kprobes")
from the tip tree and commits:
31c5c870a112 ("lkdtm: Convert from jprobe to kprobe")
75f98b7ab748 ("lkdtm: Constify the crashtypes table")
from the char-misc tree.
[8776fe75dc0e and 31c5c870a112 are the same patch]
I fixed it up (I just usted 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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
