Hi all,

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

  net/hsr/hsr_framereg.c

between commit:

  28e8cabe80f3 ("net: hsr: Don't log netdev_err message on unknown prp dst node")

from the net tree and commit:

  4821c186b9c3 ("net: hsr: Don't log netdev_err message on unknown prp dst node")

from the net-next tree.

I fixed it up (I just used the latter version) 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