On Thu, Apr 06, 2017 at 01:34:20PM +1000, Stephen Rothwell wrote:
> 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")
There are two commits which do similar things. In the v4l-dvb tree we have
5cd6522 ("[media] staging: lirc: use octal instead of symbolic permission"
and in the staging tree there is
87ddb91067b9 ("Staging: media: lirc - style fix")
Is it possible to drop the latter from the staging tree? That would resolve
the issue.
Thanks
Sean
--
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
