Hi all,
Today's linux-next merge of the tomoyo tree got a conflict in:
net/netlink/af_netlink.c
between commits:
5380d64f8d76 ("rtnetlink: move rtnl_lock handling out of af_netlink")
5fbf57a937f4 ("net: netlink: remove the cb_mutex "injection" from netlink core")
from the net-next tree and commit:
c2bfadd666b5 ("rtnetlink: print rtnl_mutex holder/waiter for debug purpose")
from the tomoyo tree.
I fixed it up (I just used the former) 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.
It looks like the tomoyo tree commit should just be completely dropped?
--
Cheers,
Stephen Rothwell
Attachment:
pgpxCiNPK0aIo.pgp
Description: OpenPGP digital signature
