Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/tipc/subscr.c
between commit:
4de13d7ed6ff ("tipc: fix nullptr crash during subscription cancel")
from the net tree and commit:
7c13c6224123 ("tipc: introduce tipc_subscrb_subscribe() routine")
(and following ones)
from the net-next tree.
I fixed it up (I used the net-next tree version as it is not obvious tha
the net tree patch is still needed) and can carry the fix as necessary
(no action is required).
--
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
