Skip to contentSkip to conversation

linux-next: manual merge of the rust tree with the origin tree

DISCUSSION [email protected] 1 participant 1 message Dec 13, 2021 Linux-next tree

lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

Hi all,

Today's linux-next merge of the rust tree got a conflict in:

tools/include/linux/lockdep.h

between commit:

3a49cc22d31ec ("tools/lib/lockdep: drop leftover liblockdep headers")

from the origin tree and commit:

ab4cc3d9c564d ("kallsyms: increase maximum kernel symbol length to 512")

from the rust tree.

I fixed it up by removing lockdep.h again 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.