linux-next: manual merge of the akpm tree with the drm-misc tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx




[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]
  Powered by Linux