Merge branch 't/grsec-wip' into t/all
Merge branch 't/grsecurity' into t/all
Merge branch 't/linux-upd' into t/all
Merge branch 't/nixops-unstable' into t/all
Merge branch 't/spl-3_12' into t/all

Conflicts:
	pkgs/os-specific/linux/spl/default.nix
Merge branch 't/vimrc' into t/all
Merge branch 't/xfs' into t/all