Hi Mauro,
Today's linux-next merge of the v4l-dvb-next tree got conflicts in:
Documentation/media/uapi/dvb/fe-diseqc-send-burst.rst
Documentation/media/uapi/dvb/fe-set-tone.rst
Documentation/media/uapi/dvb/fe-set-voltage.rst
between commit:
affd250dec17 ("[media] dvb uapi docs: enums are passed by value, not reference")
from the v4l-dvb-fixes tree and commit:
d9c4615854ec ("[media] dvb uapi docs: enums are passed by value, not reference")
from the v4l-dvb-next tree.
I fixed it up (I used the version from the former tree since it was
committed more recently) 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
--
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
