Merge branch 'upstream' Conflicts: src/Makefile src/nvidia_os.c
import NVIDIA-FreeBSD-x86-190.42
Merge branch 'upstream' Conflicts: obj/libGLcore.so.1 src/Makefile src/nv-freebsd.h
import NVIDIA-FreeBSD-x86-185.18.36
Merge branch 'upstream' merge and port to DragonFly Conflicts: src/Makefile src/nv-freebsd.h src/nvidia_ctl.c src/nvidia_os.c src/nvidia_subr.c
import NVIDIA-FreeBSD-x86-180.29