git.proxmox.com Git - mirror

]> git.proxmox.com Git - mirror_zfs.git/commit

author	Matthew Macy <mmacy@freebsd.org>
	Wed, 1 Jul 2020 16:10:08 +0000 (09:10 -0700)
committer	GitHub <noreply@github.com>
	Wed, 1 Jul 2020 16:10:08 +0000 (09:10 -0700)
commit	7ddb753d17f2c12f152647c0e34eb9c42ee5e4af
tree	ab796d8c21e0317bf2c8ba7d2f75eb9c903103ce	tree
parent	22831636c8c132c62c771c64e7131b422e41be34	commit \| diff

freebsd: changes necessary to coexist with dtrace in tree

Fix header conflicts when building zfs with openzfs as a vendor import.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Signed-off-by: Matt Macy <mmacy@FreeBSD.org>
Closes #10497

13 files changed:

include/os/freebsd/spl/sys/ccompile.h		diff \| blob \| blame \| history
include/os/freebsd/spl/sys/condvar.h		diff \| blob \| blame \| history
include/os/freebsd/spl/sys/file.h		diff \| blob \| blame \| history
include/os/freebsd/spl/sys/mount.h		diff \| blob \| blame \| history
include/os/freebsd/spl/sys/sunddi.h		diff \| blob \| blame \| history
module/Makefile.bsd		diff \| blob \| blame \| history
module/os/freebsd/spl/spl_misc.c		diff \| blob \| blame \| history
module/os/freebsd/spl/spl_sysevent.c		diff \| blob \| blame \| history
module/os/freebsd/zfs/arc_os.c		diff \| blob \| blame \| history
module/os/freebsd/zfs/sysctl_os.c		diff \| blob \| blame \| history
module/os/freebsd/zfs/vdev_file.c		diff \| blob \| blame \| history
module/os/freebsd/zfs/vdev_geom.c		diff \| blob \| blame \| history
module/zfs/spa_config.c		diff \| blob \| blame \| history

ZFS On Linux mirror for PVE

RSS Atom