Re: [GIT PULL for v4.16-rc1] media updates

[Stephen Rothwell]

Hi Linus,

On Tue, 6 Feb 2018 09:11:30 -0200 Mauro Carvalho Chehab 
<mche...@s-opensource.com> wrote:
>
> 1) You may expect a merge conflict due to this patch:
>       c23e0cb81e40 ("media: annotate ->poll() instances")
> 
>      See: https://lkml.org/lkml/2018/1/1/547

Looks like you missed this when doing the merge :-(

-- 
Cheers,
Stephen Rothwell