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@xxxxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
