* linux-next: manual merge of the akpm tree with the drm-misc tree
@ 2015-09-23 3:47 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-09-23 3:47 UTC (permalink / raw)
To: Andrew Morton, Daniel Vetter, intel-gfx, dri-devel
Cc: linux-next, linux-kernel
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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-09-23 3:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-23 3:47 linux-next: manual merge of the akpm tree with the drm-misc tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).