lkml.org 
[lkml]   [2018]   [Feb]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT PULL for v4.16-rc1] media updates
Hi Linus,

On Tue, 6 Feb 2018 09:11:30 -0200 Mauro Carvalho Chehab <mchehab@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

\
 
 \ /
  Last update: 2018-02-06 23:16    [W:0.032 / U:14.212 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site