On Fri, Mar 04, 2016 at 04:24:44PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/media/dvb-frontends/mn88473.c
>
> between commit:
>
> 7908fad99a6c ("[media] mn88473: finalize driver")
>
> from the v4l-dvb tree and commit:
>
> 3a35be2a1443 ("staging: media: Remove unneeded parentheses")
>
> from the staging tree.
>
> I fixed it up (I just used the v4l-dvb tree version) and can carry the
> fix as necessary (no action is required).
Thanks for this, that sounds fine.
greg k-h
--
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
