?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: c71428f 8c33116)
Merge commit '8c331166625387ef510c183eb42ba2dec1af7a0d' into merges
commit8b3c2e4de6088e3ce89173dc765764a9c70ef925
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 18 Jul 2018 01:35:50 +0000 (17 21:35 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 18 Jul 2018 01:35:50 +0000 (17 21:35 -0400)
tree35f44b774fd88c3bd7f023aedcc4a668fd4fb503tree | snapshot (tar.gz zip)
parentc71428f90e22628298fe7dfd38372de65d9f7414commit | diff
parent8c331166625387ef510c183eb42ba2dec1af7a0dcommit | diff
Merge commit '8c331166625387ef510c183eb42ba2dec1af7a0d' into merges
49 files changed:
arch/x86/kernel/platform/i86pc/os/lgrpplat.c diff1 |   |  blob | history
arch/x86/kernel/platform/i86pc/vm/hat_kdi.c diff1 |   |  blob | history
include/sys/netstack.h diff1 |  diff2 |  blob | history
kernel/drivers/net/nxge/nxge_ndd.c diff1 |  diff2 |  blob | history
kernel/fs/zfs/sys/zil.h diff1 |  diff2 |  blob | history
kernel/fs/zfs/sys/zil_impl.h diff1 |  diff2 |  blob | history
kernel/fs/zfs/sys/zio.h diff1 |  diff2 |  blob | history
kernel/fs/zfs/zfs_znode.c diff1 |   |  blob | history
kernel/fs/zfs/zil.c diff1 |   |  blob | history
kernel/fs/zfs/zio.c diff1 |   |  blob | history
kernel/os/netstack.c diff1 |   |  blob | history
kernel/vm/vm_pagelist.c diff1 |   |  blob | history
share/man/man1/adb.1 diff1 |  diff2 |  blob | history
share/man/man1/kmdb.1 diff1 |   |  blob | history
share/man/man1/mdb.1 diff1 |   |  blob | history
share/man/man3lib/libdtrace.3lib diff1 |   |  blob | history
share/man/man3malloc/umem_alloc.3malloc diff1 |   |  blob | history
share/man/man3malloc/umem_debug.3malloc diff1 |  diff2 |  blob | history
share/man/man5/pxeboot.5 diff1 |  diff2 |  blob | history
share/man/man7d/dtrace.7d diff1 |   |  blob | history
share/man/man7d/fasttrap.7d diff1 |   |  blob | history
share/man/man7d/fbt.7d diff1 |   |  blob | history
share/man/man7d/lockstat.7d diff1 |   |  blob | history
share/man/man7d/profile.7d diff1 |   |  blob | history
share/man/man7d/sdt.7d diff1 |   |  blob | history
share/man/man7d/systrace.7d diff1 |   |  blob | history
share/man/man8/dtrace.8 diff1 |   |  blob | history
share/man/man8/intrstat.8 diff1 |   |  blob | history
share/man/man8/kadb.8 diff1 |   |  blob | history
share/man/man8/lockstat.8 diff1 |   |  blob | history
share/man/man8/plockstat.8 diff1 |   |  blob | history
share/man/man8/zfs.8 diff1 |   |  blob | history
share/man/man8/zpool.8 diff1 |   |  blob | history
usr/src/boot/sys/boot/efi/loader/Makefile diff1 |  diff2 |  blob | history
usr/src/common/ficl/loader.c diff1 |  diff2 |  blob | history
usr/src/common/smbclnt/smbfs_ntacl.c diff1 |  diff2 |  blob | history
usr/src/lib/libbsm/common/adt.c diff1 |  diff2 |  blob | history
usr/src/lib/libnls/common/nlsrequest.c diff1 |  diff2 |  blob | history
usr/src/lib/libresolv2/common/isc/eventlib.c diff1 |  diff2 |  blob | history
usr/src/lib/libshell/common/sh/parse.c diff1 |  diff2 |  blob | history
usr/src/lib/libshell/common/sh/xec.c diff1 |  diff2 |  blob | history
usr/src/lib/libzfs/common/libzfs_dataset.c diff1 |  diff2 |  blob | history
usr/src/lib/libzfs/common/libzfs_pool.c diff1 |  diff2 |  blob | history
usr/src/pkg/manifests/driver-network-cxgbe.mf diff1 |  diff2 |  blob | history
usr/src/pkg/manifests/system-test-zfstest.mf diff1 |  diff2 |  blob | history
usr/src/uts/common/fs/smbsrv/smb_server.c diff1 |  diff2 |  blob | history
usr/src/uts/common/io/ib/clients/rdsv3/rds_recv.c diff1 |  diff2 |  blob | history
usr/src/uts/common/smbsrv/smb_ioctl.h diff1 |  diff2 |  blob | history
usr/src/uts/i86pc/io/mp_platform_common.c diff1 |  diff2 |  blob | history
Unleashed OS