lkml.org 
[lkml]   [2015]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the akpm tree with the drm-misc tree
Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in:

drivers/gpu/drm/drm_irq.c

between commit:

4e32087d8341 ("drm: Use vblank timestamps to guesstimate how many vblanks were missed")

from the drm-misc tree and patch:

"Remove abs64()"

from the akpm tree.

I fixed it up (the former removed the instances of abs64 in thet file)
and can carry the fix as necessary (no action is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au


\
 
 \ /
  Last update: 2015-09-23 06:01    [W:0.072 / U:0.068 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site