Module Name: src
Committed By: pgoyette
Date: Thu Mar 15 11:17:55 UTC 2018
Modified Files:
src/sys/compat/common [pgoyette-compat]: compat_mod.c files.common
src/sys/uvm [pgoyette-compat]: uvm_swap.c uvm_swap.h
Log Message:
Resolve conflicts from sync-with-HEAD
To generate a diff of this commit:
cvs rdiff -u -r1.24.14.7 -r1.24.14.8 src/sys/compat/common/compat_mod.c
cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/sys/compat/common/files.common
cvs rdiff -u -r1.175.2.3 -r1.175.2.4 src/sys/uvm/uvm_swap.c
cvs rdiff -u -r1.22.16.2 -r1.22.16.3 src/sys/uvm/uvm_swap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
