FreeBSDDesktop / DEPRECATED-freebsd-base-graphics

Fork of FreeBSD's base repository to work on graphics-stack-related projects
Other
49 stars 13 forks source link

Merge `master` from https://github.com/freebsd/freebsd.git #83

Closed dumbbell closed 8 years ago

dumbbell commented 8 years ago

There were two conflicts:

  1. sys/sys/filedesc.h because a function was added above fd_modified().
  2. sys/dev/drm2/drmP.h because the file is removed in drm-next-4.7. The patch in HEAD fixes the build with Clang 3.9. I ported it to include/drm/drmP.h.