Diffusion FreeBSD src repository - subversion rS280258

Merge r263233 from HEAD to stable/10:
rS280258
Actions

Description

Merge r263233 from HEAD to stable/10:

Update kernel inclusions of capability.h to use capsicum.h instead; some
further refinement is required as some device drivers intended to be
portable over FreeBSD versions rely on __FreeBSD_version to decide whether
to include capability.h.

Details

Provenance

rwatson

Authored on

Parents

rS280257: MFC r279920:

Branches

Unknown

Tags

Unknown

Event Timeline

Changes (68)

Path

Size

stable/

10/

sys/

amd64/

sys_machdep.c

linux32/

linux32_machdep.c

arm/

sys_machdep.c

cam/

ctl/

ctl_frontend_iscsi.c

cddl/

compat/

opensolaris/

sys/

file.h

compat/

freebsd32/

freebsd32_capability.c

linux/

svr4/

dev/

aac/

aacraid/

amr/

filemon/

hwpmc/

ipmi/

iscsi/

iscsi_initiator/

mfi/

tdfx/

fs/

fdescfs/

fuse/

nfsclient/

nfsserver/

i386/

ibcs2/

linux/

kern/

netsmb/

nfsserver/

security/

mac/

mac_syscalls.c

sparc64/

sys_machdep.c

ufs/

ffs/

ffs_alloc.c

vm/

vm_mmap.c

rS280258

View Options

stable/10/

View Options

stable/10/sys/amd64/amd64/sys_machdep.c

View Options

stable/10/sys/amd64/linux32/linux32_machdep.c

View Options

stable/10/sys/arm/arm/sys_machdep.c

View Options

stable/10/sys/cam/ctl/ctl_frontend_iscsi.c

View Options

stable/10/sys/cddl/compat/opensolaris/sys/file.h

View Options

stable/10/sys/compat/freebsd32/freebsd32_capability.c

View Options

stable/10/sys/compat/freebsd32/freebsd32_ioctl.c

View Options

stable/10/sys/compat/freebsd32/freebsd32_misc.c

View Options

stable/10/sys/compat/linux/linux_file.c

View Options

stable/10/sys/compat/linux/linux_ioctl.c

View Options

stable/10/sys/compat/linux/linux_socket.c

View Options

stable/10/sys/compat/svr4/svr4_fcntl.c

View Options

stable/10/sys/compat/svr4/svr4_filio.c

View Options

stable/10/sys/compat/svr4/svr4_ioctl.c

View Options

stable/10/sys/compat/svr4/svr4_misc.c

View Options

stable/10/sys/compat/svr4/svr4_stream.c

View Options

stable/10/sys/dev/aac/aac_linux.c

View Options

stable/10/sys/dev/aacraid/aacraid_linux.c

View Options

stable/10/sys/dev/amr/amr_linux.c

View Options

stable/10/sys/dev/filemon/filemon.c

View Options

stable/10/sys/dev/hwpmc/hwpmc_logging.c

View Options

stable/10/sys/dev/ipmi/ipmi_linux.c

View Options

stable/10/sys/dev/iscsi/icl.c

View Options

stable/10/sys/dev/iscsi/icl_proxy.c

View Options

stable/10/sys/dev/iscsi_initiator/iscsi.c

View Options

stable/10/sys/dev/mfi/mfi_linux.c

View Options

stable/10/sys/dev/tdfx/tdfx_linux.c

View Options

stable/10/sys/fs/fdescfs/fdesc_vnops.c

View Options

stable/10/sys/fs/fuse/fuse_vfsops.c

View Options

stable/10/sys/fs/nfsclient/nfs_clport.c

View Options

stable/10/sys/fs/nfsserver/nfs_nfsdport.c

View Options

stable/10/sys/i386/i386/sys_machdep.c

View Options

stable/10/sys/i386/ibcs2/ibcs2_fcntl.c

View Options

stable/10/sys/i386/ibcs2/ibcs2_ioctl.c

View Options

stable/10/sys/i386/ibcs2/ibcs2_misc.c

View Options

stable/10/sys/i386/linux/linux_machdep.c

View Options

stable/10/sys/kern/imgact_elf.c

View Options

stable/10/sys/kern/kern_descrip.c

View Options

stable/10/sys/kern/kern_event.c

View Options

stable/10/sys/kern/kern_exec.c

View Options

stable/10/sys/kern/kern_exit.c

View Options

stable/10/sys/kern/kern_ktrace.c

View Options

stable/10/sys/kern/kern_sig.c

View Options

stable/10/sys/kern/kern_sysctl.c

View Options

stable/10/sys/kern/subr_capability.c

View Options

stable/10/sys/kern/subr_syscall.c

View Options

stable/10/sys/kern/subr_trap.c

View Options

stable/10/sys/kern/sys_capability.c

View Options

stable/10/sys/kern/sys_generic.c

View Options

stable/10/sys/kern/sys_procdesc.c

View Options

stable/10/sys/kern/tty.c

View Options

stable/10/sys/kern/uipc_mqueue.c

View Options

stable/10/sys/kern/uipc_sem.c

View Options

stable/10/sys/kern/uipc_shm.c

View Options

stable/10/sys/kern/uipc_syscalls.c

View Options

stable/10/sys/kern/uipc_usrreq.c

View Options

stable/10/sys/kern/vfs_acl.c

View Options

stable/10/sys/kern/vfs_aio.c

View Options

stable/10/sys/kern/vfs_extattr.c

View Options

stable/10/sys/kern/vfs_lookup.c

View Options

stable/10/sys/kern/vfs_syscalls.c

View Options

stable/10/sys/netsmb/smb_dev.c

View Options

stable/10/sys/nfsserver/nfs_srvkrpc.c

View Options

stable/10/sys/security/mac/mac_syscalls.c

View Options

stable/10/sys/sparc64/sparc64/sys_machdep.c

View Options

stable/10/sys/ufs/ffs/ffs_alloc.c

View Options

stable/10/sys/vm/vm_mmap.c

Merge r263233 from HEAD to stable/10:rS280258Actions

Description

Details

Event Timeline

Changes (68)

rS280258

stable/10/

stable/10/sys/amd64/amd64/sys_machdep.c

stable/10/sys/amd64/linux32/linux32_machdep.c

stable/10/sys/arm/arm/sys_machdep.c

stable/10/sys/cam/ctl/ctl_frontend_iscsi.c

stable/10/sys/cddl/compat/opensolaris/sys/file.h

stable/10/sys/compat/freebsd32/freebsd32_capability.c

stable/10/sys/compat/freebsd32/freebsd32_ioctl.c

stable/10/sys/compat/freebsd32/freebsd32_misc.c

stable/10/sys/compat/linux/linux_file.c

stable/10/sys/compat/linux/linux_ioctl.c

stable/10/sys/compat/linux/linux_socket.c

stable/10/sys/compat/svr4/svr4_fcntl.c

stable/10/sys/compat/svr4/svr4_filio.c

stable/10/sys/compat/svr4/svr4_ioctl.c

stable/10/sys/compat/svr4/svr4_misc.c

stable/10/sys/compat/svr4/svr4_stream.c

stable/10/sys/dev/aac/aac_linux.c

stable/10/sys/dev/aacraid/aacraid_linux.c

stable/10/sys/dev/amr/amr_linux.c

stable/10/sys/dev/filemon/filemon.c

stable/10/sys/dev/hwpmc/hwpmc_logging.c

stable/10/sys/dev/ipmi/ipmi_linux.c

stable/10/sys/dev/iscsi/icl.c

stable/10/sys/dev/iscsi/icl_proxy.c

stable/10/sys/dev/iscsi_initiator/iscsi.c

stable/10/sys/dev/mfi/mfi_linux.c

stable/10/sys/dev/tdfx/tdfx_linux.c

stable/10/sys/fs/fdescfs/fdesc_vnops.c

stable/10/sys/fs/fuse/fuse_vfsops.c

stable/10/sys/fs/nfsclient/nfs_clport.c

stable/10/sys/fs/nfsserver/nfs_nfsdport.c

stable/10/sys/i386/i386/sys_machdep.c

stable/10/sys/i386/ibcs2/ibcs2_fcntl.c

stable/10/sys/i386/ibcs2/ibcs2_ioctl.c

stable/10/sys/i386/ibcs2/ibcs2_misc.c

stable/10/sys/i386/linux/linux_machdep.c

stable/10/sys/kern/imgact_elf.c

stable/10/sys/kern/kern_descrip.c

stable/10/sys/kern/kern_event.c

stable/10/sys/kern/kern_exec.c

stable/10/sys/kern/kern_exit.c

stable/10/sys/kern/kern_ktrace.c

stable/10/sys/kern/kern_sig.c

stable/10/sys/kern/kern_sysctl.c

stable/10/sys/kern/subr_capability.c

stable/10/sys/kern/subr_syscall.c

stable/10/sys/kern/subr_trap.c

stable/10/sys/kern/sys_capability.c

stable/10/sys/kern/sys_generic.c

stable/10/sys/kern/sys_procdesc.c

stable/10/sys/kern/tty.c

stable/10/sys/kern/uipc_mqueue.c

stable/10/sys/kern/uipc_sem.c

stable/10/sys/kern/uipc_shm.c

stable/10/sys/kern/uipc_syscalls.c

stable/10/sys/kern/uipc_usrreq.c

stable/10/sys/kern/vfs_acl.c

stable/10/sys/kern/vfs_aio.c

stable/10/sys/kern/vfs_extattr.c

stable/10/sys/kern/vfs_lookup.c

stable/10/sys/kern/vfs_syscalls.c

stable/10/sys/netsmb/smb_dev.c

stable/10/sys/nfsserver/nfs_srvkrpc.c

stable/10/sys/security/mac/mac_syscalls.c

stable/10/sys/sparc64/sparc64/sys_machdep.c

stable/10/sys/ufs/ffs/ffs_alloc.c

stable/10/sys/vm/vm_mmap.c

Merge r263233 from HEAD to stable/10:
rS280258
Actions