Closed dumbbell closed 8 years ago
There were two conflicts:
sys/sys/filedesc.h
fd_modified()
sys/dev/drm2/drmP.h
drm-next-4.7
include/drm/drmP.h
There were two conflicts:
sys/sys/filedesc.h
because a function was added abovefd_modified()
.sys/dev/drm2/drmP.h
because the file is removed indrm-next-4.7
. The patch in HEAD fixes the build with Clang 3.9. I ported it toinclude/drm/drmP.h
.