On Tue, Feb 6, 2018 at 2:16 PM, Stephen Rothwell 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
Hi Linus,
On Tue, 6 Feb 2018 09:11:30 -0200 Mauro Carvalho Chehab
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 :-(
-
Hi Linus,
Please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
tags/media/v4.16-2
For:
- videobuf2 was moved to a media/common dir, as it is now used by the DVB
subsystem too;
- Digital TV core memory mapped support interface;
- New sensor drivers: ov7740;
- S
