Hi all,
Today's linux-next merge of the staging tree got conflicts in:
drivers/staging/media/lirc/lirc_sasem.c
drivers/staging/media/lirc/lirc_sir.c
between commits:
e66267161971 ("[media] rc: promote lirc_sir out of staging")
51bb3fd788cb ("[media] staging: lirc_sasem: remove")
from the v4l-dvb tree and commit:
87ddb91067b9 ("Staging: media: lirc - style fix")
from the staging tree.
I fixed it up (I removed both files - the updates to lirc_sir.c were
also done in the v4l-dvb tree) 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
