Hi all, Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/media/tegra-vde/tegra-vde.c
between commit:
91dc5e91edf7 ("media: staging: tegra-vde: Replace debug messages with trace
points")
from the v4l-dvb tree and commit:
9483804a725a ("media: staging: tegra-vde: print long unsigned using %lu
format specifier")
from the staging tree.
I fixed it up (the former removed the code updated by the latter, so I
did that) 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
pgpc2wym0hAJS.pgp
Description: OpenPGP digital signature
