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

[Linus Torvalds]

On Tue, Feb 6, 2018 at 2:16 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>>      See: https://lkml.org/lkml/2018/1/1/547
>
> Looks like you missed this when doing the merge :-(

Gaah. I noticed the actual conflicts, and then didn't actually notice
that there had been some other __poll_t noise too.

Will apply your patch.

           Linus