PERFORCE change 139617 for review
Sam Leffler
sam at FreeBSD.org
Tue Apr 8 21:28:08 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=139617
Change 139617 by sam at sam_ebb on 2008/04/08 21:27:55
IFC @ 139613
Affected files ...
.. //depot/projects/qingli_mpath/src/Makefile#4 integrate
.. //depot/projects/qingli_mpath/src/Makefile.inc1#3 integrate
.. //depot/projects/qingli_mpath/src/ObsoleteFiles.inc#4 integrate
.. //depot/projects/qingli_mpath/src/UPDATING#3 integrate
.. //depot/projects/qingli_mpath/src/bin/ls/ls.1#2 integrate
.. //depot/projects/qingli_mpath/src/bin/ls/ls.c#2 integrate
.. //depot/projects/qingli_mpath/src/bin/ls/ls.h#2 integrate
.. //depot/projects/qingli_mpath/src/bin/ls/print.c#2 integrate
.. //depot/projects/qingli_mpath/src/bin/ls/util.c#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/alloca.h#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/fcntl.h#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/fsshare.h#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/stdio.h#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/stdlib.h#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/strings.h#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/unistd.h#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/deviceid.c#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/fsshare.c#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/mnttab.c#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/zmount.c#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/zone.c#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/lib/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/usr.bin/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/cddl/usr.sbin/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/contrib/netcat/nc.1#2 integrate
.. //depot/projects/qingli_mpath/src/contrib/netcat/netcat.c#2 integrate
.. //depot/projects/qingli_mpath/src/contrib/pf/pfctl/pfctl_altq.c#2 integrate
.. //depot/projects/qingli_mpath/src/contrib/pf/pfctl/pfctl_qstats.c#2 integrate
.. //depot/projects/qingli_mpath/src/etc/network.subr#2 integrate
.. //depot/projects/qingli_mpath/src/etc/rc.d/ppp#4 integrate
.. //depot/projects/qingli_mpath/src/etc/rc.d/wpa_supplicant#2 integrate
.. //depot/projects/qingli_mpath/src/etc/rc.d/zfs#3 integrate
.. //depot/projects/qingli_mpath/src/games/fortune/datfiles/fortunes#3 integrate
.. //depot/projects/qingli_mpath/src/gnu/usr.bin/gdb/kgdb/kld.c#2 integrate
.. //depot/projects/qingli_mpath/src/gnu/usr.bin/gdb/kgdb/main.c#3 integrate
.. //depot/projects/qingli_mpath/src/include/complex.h#2 integrate
.. //depot/projects/qingli_mpath/src/include/stdio.h#3 integrate
.. //depot/projects/qingli_mpath/src/include/unistd.h#3 integrate
.. //depot/projects/qingli_mpath/src/lib/libarchive/archive_entry_private.h#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libc/gen/Makefile.inc#3 integrate
.. //depot/projects/qingli_mpath/src/lib/libc/gen/err.c#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libc/gen/modf.3#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libc/gen/msgctl.3#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libc/include/libc_private.h#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libc/include/namespace.h#4 integrate
.. //depot/projects/qingli_mpath/src/lib/libc/include/un-namespace.h#4 integrate
.. //depot/projects/qingli_mpath/src/lib/libc/rpc/svc_vc.c#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libc/stdtime/localtime.c#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libc/sys/Makefile.inc#3 integrate
.. //depot/projects/qingli_mpath/src/lib/libc/sys/Symbol.map#4 integrate
.. //depot/projects/qingli_mpath/src/lib/libc/sys/aio_cancel.2#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libc/sys/aio_suspend.2#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libc/sys/cpuset.2#1 branch
.. //depot/projects/qingli_mpath/src/lib/libc/sys/cpuset_getaffinity.2#1 branch
.. //depot/projects/qingli_mpath/src/lib/libc/sys/fcntl.c#1 branch
.. //depot/projects/qingli_mpath/src/lib/libc/sys/mincore.2#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libc/xdr/xdr_rec.c#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libstand/nfs.c#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libthr/Makefile#4 integrate
.. //depot/projects/qingli_mpath/src/lib/libthr/arch/amd64/Makefile.inc#3 integrate
.. //depot/projects/qingli_mpath/src/lib/libthr/arch/amd64/amd64/_umtx_op_err.S#1 branch
.. //depot/projects/qingli_mpath/src/lib/libthr/arch/amd64/include/pthread_md.h#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libthr/arch/i386/Makefile.inc#3 integrate
.. //depot/projects/qingli_mpath/src/lib/libthr/arch/i386/i386/_umtx_op_err.S#1 branch
.. //depot/projects/qingli_mpath/src/lib/libthr/arch/i386/include/pthread_md.h#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_affinity.c#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_cond.c#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_private.h#3 integrate
.. //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_rtld.c#3 integrate
.. //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_rwlock.c#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_umtx.c#2 integrate
.. //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_umtx.h#2 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/Makefile#3 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/Symbol.map#3 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/amd64/Makefile.inc#3 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/amd64/e_remainderl.S#1 branch
.. //depot/projects/qingli_mpath/src/lib/msun/amd64/s_remquol.S#1 branch
.. //depot/projects/qingli_mpath/src/lib/msun/i387/Makefile.inc#3 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/i387/e_remainderl.S#1 branch
.. //depot/projects/qingli_mpath/src/lib/msun/i387/s_remquol.S#1 branch
.. //depot/projects/qingli_mpath/src/lib/msun/man/csqrt.3#2 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/man/hypot.3#2 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/man/remainder.3#2 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/src/e_hypot.c#3 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/src/e_hypotf.c#3 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/src/e_hypotl.c#1 branch
.. //depot/projects/qingli_mpath/src/lib/msun/src/e_log.c#3 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/src/e_logf.c#3 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/src/e_remainder.c#3 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/src/e_remainderl.c#1 branch
.. //depot/projects/qingli_mpath/src/lib/msun/src/math.h#3 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/src/s_csqrt.c#2 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/src/s_csqrtl.c#1 branch
.. //depot/projects/qingli_mpath/src/lib/msun/src/s_expm1.c#3 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/src/s_expm1f.c#3 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/src/s_fma.c#2 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/src/s_fmaf.c#2 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/src/s_fmal.c#2 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/src/s_log1p.c#3 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/src/s_log1pf.c#3 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/src/s_remquo.c#2 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/src/s_remquol.c#1 branch
.. //depot/projects/qingli_mpath/src/lib/msun/src/w_cabs.c#3 integrate
.. //depot/projects/qingli_mpath/src/lib/msun/src/w_cabsl.c#1 branch
.. //depot/projects/qingli_mpath/src/libexec/rtld-elf/mips/reloc.c#1 branch
.. //depot/projects/qingli_mpath/src/libexec/rtld-elf/mips/rtld_machdep.h#1 branch
.. //depot/projects/qingli_mpath/src/libexec/rtld-elf/mips/rtld_start.S#1 branch
.. //depot/projects/qingli_mpath/src/libexec/rtld-elf/rtld.c#2 integrate
.. //depot/projects/qingli_mpath/src/libexec/rtld-elf/rtld.h#2 integrate
.. //depot/projects/qingli_mpath/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#4 integrate
.. //depot/projects/qingli_mpath/src/release/ia64/mkisoimages.sh#2 integrate
.. //depot/projects/qingli_mpath/src/rescue/rescue/Makefile#3 integrate
.. //depot/projects/qingli_mpath/src/sbin/ddb/ddb.8#3 integrate
.. //depot/projects/qingli_mpath/src/sbin/ddb/ddb.c#3 integrate
.. //depot/projects/qingli_mpath/src/sbin/dhclient/dhclient-script#3 integrate
.. //depot/projects/qingli_mpath/src/sbin/fsck_ffs/main.c#3 integrate
.. //depot/projects/qingli_mpath/src/sbin/ggate/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/sbin/gpt/gpt.c#3 integrate
.. //depot/projects/qingli_mpath/src/sbin/ifconfig/ifclone.c#2 integrate
.. //depot/projects/qingli_mpath/src/sbin/ifconfig/ifconfig.c#2 integrate
.. //depot/projects/qingli_mpath/src/sbin/ifconfig/ifconfig.h#2 integrate
.. //depot/projects/qingli_mpath/src/sbin/ifconfig/ifvlan.c#2 integrate
.. //depot/projects/qingli_mpath/src/sbin/restore/dirs.c#2 integrate
.. //depot/projects/qingli_mpath/src/sbin/restore/interactive.c#2 integrate
.. //depot/projects/qingli_mpath/src/share/man/man3/Makefile#3 integrate
.. //depot/projects/qingli_mpath/src/share/man/man4/Makefile#3 integrate
.. //depot/projects/qingli_mpath/src/share/man/man4/arcmsr.4#2 integrate
.. //depot/projects/qingli_mpath/src/share/man/man4/asmc.4#2 integrate
.. //depot/projects/qingli_mpath/src/share/man/man4/bpf.4#3 integrate
.. //depot/projects/qingli_mpath/src/share/man/man4/ng_pptpgre.4#2 integrate
.. //depot/projects/qingli_mpath/src/share/man/man4/psm.4#2 integrate
.. //depot/projects/qingli_mpath/src/share/man/man4/ubsa.4#2 integrate
.. //depot/projects/qingli_mpath/src/share/man/man5/rc.conf.5#4 integrate
.. //depot/projects/qingli_mpath/src/share/man/man5/src.conf.5#2 integrate
.. //depot/projects/qingli_mpath/src/share/man/man8/rc.subr.8#2 integrate
.. //depot/projects/qingli_mpath/src/share/man/man9/Makefile#3 integrate
.. //depot/projects/qingli_mpath/src/share/man/man9/lock.9#3 integrate
.. //depot/projects/qingli_mpath/src/share/man/man9/rwlock.9#3 integrate
.. //depot/projects/qingli_mpath/src/share/man/man9/sleep.9#2 integrate
.. //depot/projects/qingli_mpath/src/share/mk/bsd.own.mk#3 integrate
.. //depot/projects/qingli_mpath/src/share/mk/sys.mk#3 integrate
.. //depot/projects/qingli_mpath/src/sys/amd64/amd64/intr_machdep.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/amd64/amd64/pmap.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/amd64/linux32/linux.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/amd64/linux32/linux32_dummy.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/amd64/linux32/linux32_proto.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/amd64/linux32/linux32_syscall.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/amd64/linux32/linux32_sysent.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/amd64/linux32/linux32_sysvec.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/amd64/linux32/syscalls.master#3 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/arm/bus_space_generic.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/arm/arm/elf_trampoline.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/arm/exception.S#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/arm/intr.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/arm/locore.S#3 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/arm/machdep.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/at91/kb920x_machdep.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/include/machdep.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/sa11x0/files.sa11x0#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/sa11x0/sa11x0_io.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/xscale/i80321/files.ep80219#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/xscale/i80321/files.i80219#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/xscale/i80321/files.i80321#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/xscale/i80321/files.iq31244#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/xscale/i80321/obio_space.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/xscale/i8134x/files.i81342#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/xscale/i8134x/obio_space.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/xscale/ixp425/files.avila#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/xscale/ixp425/files.ixp425#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/arm/xscale/ixp425/ixp425_space.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/boot/forth/loader.conf#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/machine/endian.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/atomic.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/cmn_err.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/cred.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/cyclic.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/debug.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/dirent.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/dnlc.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/elf.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/kcondvar.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/kmem.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/kobj.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/kstat.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/lock.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/misc.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/mman.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/mnttab.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/modctl.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/mount.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/mutex.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/param.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/pcpu.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/proc.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/random.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/rwlock.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/sdt.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/stat.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/string.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/sunddi.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/systm.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/time.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/types.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/uio.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/varargs.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/vfs.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/compat/opensolaris/sys/zone.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#2 integrate
.. //depot/projects/qingli_mpath/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/compat/freebsd32/freebsd32_proto.h#4 integrate
.. //depot/projects/qingli_mpath/src/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate
.. //depot/projects/qingli_mpath/src/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/compat/freebsd32/syscalls.master#4 integrate
.. //depot/projects/qingli_mpath/src/sys/compat/linprocfs/linprocfs.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/compat/linux/linux_file.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/compat/linux/linux_file.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/compat/linux/linux_misc.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/compat/linux/linux_stats.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/compat/linux/linux_uid16.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/compat/linux/linux_util.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/compat/linux/linux_util.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/compat/pecoff/imgact_pecoff.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/compat/svr4/svr4_sysvec.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/conf/Makefile.arm#3 integrate
.. //depot/projects/qingli_mpath/src/sys/conf/NOTES#5 integrate
.. //depot/projects/qingli_mpath/src/sys/conf/files#6 integrate
.. //depot/projects/qingli_mpath/src/sys/conf/options#5 integrate
.. //depot/projects/qingli_mpath/src/sys/contrib/pf/net/pf_if.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/contrib/pf/net/pfvar.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/aac/aac.c#6 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/aac/aac_disk.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/acpica/Osd/OsdSynch.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/acpica/acpi.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/asmc/asmc.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/asmc/asmcvar.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/atkbdc/psm.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/bge/if_bge.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/cxgb/cxgb_adapter.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/cxgb/sys/cxgb_support.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/de/if_de.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_80003es2lan.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_82540.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_82541.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_82542.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_82543.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_82571.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_82571.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_api.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_api.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_defines.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_hw.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_ich8lan.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_ich8lan.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_mac.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_mac.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_manage.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_nvm.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_nvm.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_osdep.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_osdep.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_phy.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/e1000_phy.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/if_em.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/em/if_em.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/igb/e1000_mac.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/igb/e1000_osdep.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/dev/igb/if_igb.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/malo/if_malohal.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/mii/ip1000phy.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/mii/ip1000phyreg.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/mii/miidevs#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/mpt/mpt.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/mxge/if_mxge.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/re/if_re.c#5 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/usb/ehci_pci.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/usb/ubsa.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/usb/uhci_pci.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/dev/usb/usbdevs#5 integrate
.. //depot/projects/qingli_mpath/src/sys/fs/coda/coda_vfsops.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/fs/fdescfs/fdesc_vnops.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/fs/nullfs/null_subr.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/fs/nullfs/null_vfsops.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/fs/unionfs/union_subr.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/fs/unionfs/union_vfsops.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/geom/geom_subr.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/geom/part/g_part.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/geom/part/g_part_pc98.c#1 branch
.. //depot/projects/qingli_mpath/src/sys/i386/i386/busdma_machdep.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/i386/intr_machdep.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/i386/pmap.c#5 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/ibcs2/ibcs2_util.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/linux/linux.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/linux/linux_dummy.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/linux/linux_proto.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/linux/linux_syscall.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/linux/linux_sysent.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/linux/linux_sysvec.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/i386/linux/syscalls.master#3 integrate
.. //depot/projects/qingli_mpath/src/sys/ia64/ia64/elf_machdep.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/ia64/ia64/interrupt.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/ia64/ia64/machdep.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/ia64/ia64/pmap.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/ia64/include/md_var.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/init_sysent.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/kern_clock.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/kern_conf.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/kern_cpuset.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/kern_event.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/kern_exec.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/kern_intr.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/kern_jail.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/kern_lock.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/kern_lockf.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/kern_mbuf.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/kern_rwlock.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/kern_timeout.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/kern_umtx.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/sched_ule.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/subr_sleepqueue.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/subr_taskqueue.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/syscalls.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/syscalls.master#4 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/systrace_args.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/uipc_mqueue.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/vfs_acl.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/vfs_bio.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/vfs_cache.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/vfs_extattr.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/vfs_lookup.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/vfs_mount.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/vfs_subr.c#5 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/vfs_syscalls.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/kern/vfs_vnops.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/modules/Makefile#4 integrate
.. //depot/projects/qingli_mpath/src/sys/modules/asmc/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/sys/modules/em/Makefile#4 integrate
.. //depot/projects/qingli_mpath/src/sys/modules/geom/geom_part/Makefile#3 integrate
.. //depot/projects/qingli_mpath/src/sys/modules/geom/geom_part/geom_part_pc98/Makefile#1 branch
.. //depot/projects/qingli_mpath/src/sys/modules/igb/Makefile#3 integrate
.. //depot/projects/qingli_mpath/src/sys/net/bpf.c#5 integrate
.. //depot/projects/qingli_mpath/src/sys/net/bpf_zerocopy.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/net/bpf_zerocopy.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/net/if_loop.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/netgraph/ng_base.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/netgraph/ng_car.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/netinet/in_pcb.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/netinet/tcp.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/netinet/tcp_input.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/netinet/tcp_output.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/netinet6/in6_pcb.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/netncp/ncp_conn.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/nlm/nlm_prot_clnt.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/nlm/nlm_prot_impl.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/nlm/nlm_prot_server.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/nlm/nlm_prot_svc.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/nlm/nlm_prot_xdr.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/nlm/sm_inter_xdr.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/pc98/cbus/sc_machdep.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/pc98/cbus/syscons_cbus.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/pci/if_rlreg.h#4 integrate
.. //depot/projects/qingli_mpath/src/sys/powerpc/include/asm.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/powerpc/include/atomic.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/powerpc/powerpc/intr_machdep.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/powerpc/psim/openpic_iobus.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/rpc/auth_unix.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/rpc/authunix_prot.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/rpc/clnt_dg.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/rpc/clnt_rc.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/rpc/clnt_vc.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/rpc/inet_ntop.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/rpc/inet_pton.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/rpc/rpc_generic.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/rpc/rpcb_clnt.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/rpc/svc.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/rpc/svc_auth_unix.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/rpc/svc_dg.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/rpc/svc_generic.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/rpc/svc_vc.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/security/mac/mac_syscalls.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/sparc64/sparc64/intr_machdep.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/sun4v/sun4v/intr_machdep.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/_lockmgr.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/sys/_stack.h#1 branch
.. //depot/projects/qingli_mpath/src/sys/sys/aac_ioctl.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/buf.h#5 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/callout.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/cpuset.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/eventhandler.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/fcntl.h#4 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/imgact.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/interrupt.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/kernel.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/lockmgr.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/mman.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/namei.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/param.h#5 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/proc.h#4 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/rwlock.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/sleepqueue.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/stack.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/stat.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/syscall.h#4 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/syscall.mk#4 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/syscallsubr.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/sysproto.h#4 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/time.h#3 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/umtx.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/sys/vnode.h#4 integrate
.. //depot/projects/qingli_mpath/src/sys/ufs/ffs/ffs_snapshot.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/ufs/ffs/ffs_softdep.c#5 integrate
.. //depot/projects/qingli_mpath/src/sys/ufs/ffs/ffs_vnops.c#4 integrate
.. //depot/projects/qingli_mpath/src/sys/ufs/ufs/ufs_gjournal.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/vm/uma.h#2 integrate
.. //depot/projects/qingli_mpath/src/sys/vm/uma_core.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/vm/vm_kern.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/vm/vm_map.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/vm/vm_object.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/vm/vm_page.c#3 integrate
.. //depot/projects/qingli_mpath/src/sys/vm/vm_phys.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/vm/vm_reserv.c#2 integrate
.. //depot/projects/qingli_mpath/src/sys/vm/vm_reserv.h#2 integrate
.. //depot/projects/qingli_mpath/src/tools/build/mk/OptionalObsoleteFiles.inc#4 integrate
.. //depot/projects/qingli_mpath/src/tools/build/options/WITHOUT_LIBKSE#2 delete
.. //depot/projects/qingli_mpath/src/tools/regression/lib/msun/Makefile#3 integrate
.. //depot/projects/qingli_mpath/src/tools/regression/lib/msun/test-csqrt.c#2 integrate
.. //depot/projects/qingli_mpath/src/tools/regression/lib/msun/test-fma.c#1 branch
.. //depot/projects/qingli_mpath/src/tools/regression/lib/msun/test-fma.t#1 branch
.. //depot/projects/qingli_mpath/src/tools/regression/lib/msun/test-rem.c#2 integrate
.. //depot/projects/qingli_mpath/src/tools/tools/README#3 integrate
.. //depot/projects/qingli_mpath/src/tools/tools/mctest/Makefile#1 branch
.. //depot/projects/qingli_mpath/src/tools/tools/mctest/mctest.1#1 branch
.. //depot/projects/qingli_mpath/src/tools/tools/mctest/mctest.cc#2 integrate
.. //depot/projects/qingli_mpath/src/tools/tools/mctest/mctest.h#2 integrate
.. //depot/projects/qingli_mpath/src/usr.bin/Makefile#3 integrate
.. //depot/projects/qingli_mpath/src/usr.bin/gprof/gprof.h#2 integrate
.. //depot/projects/qingli_mpath/src/usr.bin/kdump/kdump.1#3 integrate
.. //depot/projects/qingli_mpath/src/usr.bin/kdump/kdump.c#3 integrate
.. //depot/projects/qingli_mpath/src/usr.bin/ktrace/ktrace.1#3 integrate
.. //depot/projects/qingli_mpath/src/usr.bin/ktrace/ktrace.c#3 integrate
.. //depot/projects/qingli_mpath/src/usr.bin/xlint/lint1/param.h#2 integrate
.. //depot/projects/qingli_mpath/src/usr.sbin/Makefile#4 integrate
.. //depot/projects/qingli_mpath/src/usr.sbin/amd/amd/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/usr.sbin/btxld/btxld.c#2 integrate
.. //depot/projects/qingli_mpath/src/usr.sbin/clear_locks/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/usr.sbin/fifolog/fifolog_reader/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#2 integrate
.. //depot/projects/qingli_mpath/src/usr.sbin/ngctl/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/Makefile#2 integrate
.. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/add/perform.c#2 integrate
.. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/Makefile#2 delete
.. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/README#2 delete
.. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/check.c#2 delete
.. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/common.c#2 delete
.. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/extern.h#2 delete
.. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/gzip.c#2 delete
.. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/gzip.h#2 delete
.. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/main.c#2 delete
.. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/pgp.h#2 delete
.. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/pgp_check.c#2 delete
.. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/pgp_sign.c#2 delete
.. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/pkg_sign.1#2 delete
.. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/sha1.c#2 delete
.. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/sign.c#2 delete
.. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/stand.c#2 delete
.. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/stand.h#2 delete
.. //depot/projects/qingli_mpath/src/usr.sbin/pkg_install/sign/x509.c#2 delete
.. //depot/projects/qingli_mpath/src/usr.sbin/rpc.lockd/lockd.c#3 integrate
.. //depot/projects/qingli_mpath/src/usr.sbin/rpc.statd/statd.c#2 integrate
.. //depot/projects/qingli_mpath/src/usr.sbin/sysinstall/devices.c#2 integrate
.. //depot/projects/qingli_mpath/src/usr.sbin/sysinstall/menus.c#3 integrate
Differences ...
==== //depot/projects/qingli_mpath/src/Makefile#4 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.346 2008/03/25 15:47:22 ru Exp $
+# $FreeBSD: src/Makefile,v 1.347 2008/03/31 13:32:55 pav Exp $
#
# The user-driven targets are:
#
@@ -36,7 +36,7 @@
# The user-driven targets (as listed above) are implemented in Makefile.inc1.
#
# If you want to build your system from source be sure that /usr/obj has
-# at least 400MB of diskspace available.
+# at least 800MB of diskspace available.
#
# For individuals wanting to build from the sources currently on their
# system, the simple instructions are:
==== //depot/projects/qingli_mpath/src/Makefile.inc1#3 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.601 2008/03/02 11:10:46 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.602 2008/03/29 17:44:38 ru Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -1039,18 +1039,14 @@
${_lib_libgssapi} ${_lib_libipx} \
lib/libkiconv lib/libkvm lib/libmd \
lib/ncurses/ncurses lib/ncurses/ncursesw \
- lib/libopie lib/libpam ${_default_thread_lib} \
+ lib/libopie lib/libpam ${_lib_libthr} \
lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_secure_lib_libssh} \
${_secure_lib_libssl}
-.if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no"
-_default_thread_lib= lib/${DEFAULT_THREAD_LIB}
-.elif ${MK_LIBTHR} != "no"
-_default_thread_lib= lib/libthr
-.elif ${MK_LIBKSE} != "no"
-_default_thread_lib= lib/libkse
+.if ${MK_LIBTHR} != "no"
+_lib_libthr= lib/libthr
.endif
_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib
==== //depot/projects/qingli_mpath/src/ObsoleteFiles.inc#4 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.134 2008/03/26 06:45:28 remko Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.136 2008/04/01 11:05:26 flz Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,11 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20080331: pkg_sign has been removed
+OLD_FILES+=usr/sbin/pkg_check
+OLD_FILES+=usr/sbin/pkg_sign
+OLD_FILES+=usr/share/man/man1/pkg_check.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_sign.1.gz
# 20080220: geom_lvm rename to geom_linux_lvm
OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz
# 20080126: oldcard.4 removal
@@ -30,7 +35,6 @@
# 20071201: Removal of XRPU driver
OLD_FILES+=usr/include/sys/xrpuio.h
# 20071129: Disabled static versions of libkse by default
-.if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no"
OLD_FILES+=usr/lib/libkse.a
OLD_FILES+=usr/lib/libkse_p.a
OLD_FILES+=usr/lib/libkse_pic.a
@@ -39,7 +43,6 @@
OLD_FILES+=usr/lib32/libkse_p.a
OLD_FILES+=usr/lib32/libkse_pic.a
.endif
-.endif
# 20071129: Removed a Solaris compatibility header
OLD_FILES+=usr/include/sys/_elf_solaris.h
# 20071125: Renamed to pmc_get_msr()
==== //depot/projects/qingli_mpath/src/UPDATING#3 (text+ko) ====
@@ -22,6 +22,13 @@
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20080408:
+ psm(4) has gained write(2) support in native operation level.
+ Arbitrary commands can be written to /dev/psm%d and status can
+ be read back from it. Therefore, an application is responsible
+ for status validation and error recovery. It is a no-op in
+ other operation levels.
+
20080312:
Support for KSE threading has been removed from the kernel. To
run legacy applications linked against KSE libmap.conf may
@@ -1007,4 +1014,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $
+$FreeBSD: src/UPDATING,v 1.524 2008/04/08 17:55:25 jkim Exp $
==== //depot/projects/qingli_mpath/src/bin/ls/ls.1#2 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ls.1 8.7 (Berkeley) 7/29/94
-.\" $FreeBSD: src/bin/ls/ls.1,v 1.100 2006/10/12 10:08:52 ru Exp $
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.102 2008/04/04 05:55:42 ru Exp $
.\"
-.Dd October 12, 2006
+.Dd April 4, 2008
.Dt LS 1
.Os
.Sh NAME
@@ -41,6 +41,7 @@
.Sh SYNOPSIS
.Nm
.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1
+.Op Fl D Ar format
.Op Ar
.Sh DESCRIPTION
For each operand that names a
@@ -88,6 +89,21 @@
is the numeric value of the character in octal.
.It Fl C
Force multi-column output; this is the default when output is to a terminal.
+.It Fl D Ar format
+When printing in the long
+.Pq Fl l
+format, use
+.Ar format
+to format the date and time output.
+The argument
+.Ar format
+is a string used by
+.Xr strftime 3 .
+Depending on the choice of format string, this may result in a
+different number of columns in the output.
+This option overrides the
+.Fl T
+option.
.It Fl F
Display a slash
.Pq Ql /
@@ -146,12 +162,13 @@
Sort by size (largest file first) before sorting the operands in
lexicographical order.
.It Fl T
-When used with the
-.Fl l
-(lowercase letter
-.Dq ell )
-option, display complete time information for the file, including
+When printing in the long
+.Pq Fl l
+format, display complete time information for the file, including
month, day, hour, minute, second, and year.
+The
+.Fl D
+option gives even more control over the output format.
.It Fl U
Use time when file was created for sorting or printing.
.It Fl W
@@ -325,7 +342,12 @@
modified, and the pathname.
.Pp
If the modification time of the file is more than 6 months
-in the past or future, then the year of the last modification
+in the past or future, and the
+.Fl D
+or
+.Fl T
+are not specified,
+then the year of the last modification
is displayed in place of the hour and minute fields.
.Pp
If the owner or group names are not a known user or group name,
@@ -657,6 +679,7 @@
.Xr getfacl 1 ,
.Xr sort 1 ,
.Xr xterm 1 ,
+.Xr strftime 3 ,
.Xr termcap 5 ,
.Xr maclabel 7 ,
.Xr symlink 7 ,
==== //depot/projects/qingli_mpath/src/bin/ls/ls.c#2 (text+ko) ====
@@ -42,7 +42,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.85 2006/03/24 17:09:03 jhb Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.86 2008/04/04 03:57:46 grog Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -125,10 +125,11 @@
static int f_singlecol; /* use single column output */
int f_size; /* list size in short listing */
int f_slash; /* similar to f_type, but only for dirs */
- int f_sortacross; /* sort across rows, not down columns */
+ int f_sortacross; /* sort across rows, not down columns */
int f_statustime; /* use time of last mode change */
static int f_stream; /* stream the output, separate with commas */
static int f_timesort; /* sort by time vice name */
+ char *f_timeformat; /* user-specified time format */
static int f_sizesort;
int f_type; /* add type character for non-regular files */
static int f_whiteout; /* show whiteout entries */
@@ -179,7 +180,7 @@
fts_options = FTS_PHYSICAL;
while ((ch = getopt(argc, argv,
- "1ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) {
+ "1ABCD:FGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) {
switch (ch) {
/*
* The -1, -C, -x and -l options all override each other so
@@ -198,6 +199,9 @@
case 'C':
f_sortacross = f_longform = f_singlecol = 0;
break;
+ case 'D':
+ f_timeformat = optarg;
+ break;
case 'l':
f_longform = 1;
f_singlecol = 0;
==== //depot/projects/qingli_mpath/src/bin/ls/ls.h#2 (text+ko) ====
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* from: @(#)ls.h 8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/bin/ls/ls.h,v 1.22 2006/03/24 16:38:02 jhb Exp $
+ * $FreeBSD: src/bin/ls/ls.h,v 1.23 2008/04/04 03:57:46 grog Exp $
*/
#define NO_PRINT 1
@@ -50,8 +50,9 @@
extern int f_sectime; /* print the real time for all files */
extern int f_size; /* list size in short listing */
extern int f_slash; /* append a '/' if the file is a directory */
-extern int f_sortacross; /* sort across rows, not down columns */
+extern int f_sortacross; /* sort across rows, not down columns */
extern int f_statustime; /* use time of last mode change */
+extern char *f_timeformat; /* user-specified time format */
extern int f_notabs; /* don't use tab-separated multi-col output */
extern int f_type; /* add type character for non-regular files */
#ifdef COLORLS
==== //depot/projects/qingli_mpath/src/bin/ls/print.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.76 2006/10/18 10:58:27 ru Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.78 2008/04/05 21:26:25 imp Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -237,7 +237,7 @@
if (chcnt)
putchar('\n');
}
-
+
void
printcol(const DISPLAY *dp)
{
@@ -378,17 +378,20 @@
now = time(NULL);
#define SIXMONTHS ((365 / 2) * 86400)
- if (f_sectime)
+ if (f_timeformat) /* user specified format */
+ format = f_timeformat;
+ else if (f_sectime)
/* mmm dd hh:mm:ss yyyy || dd mmm hh:mm:ss yyyy */
- format = d_first ? "%e %b %T %Y " : "%b %e %T %Y ";
+ format = d_first ? "%e %b %T %Y" : "%b %e %T %Y";
else if (ftime + SIXMONTHS > now && ftime < now + SIXMONTHS)
/* mmm dd hh:mm || dd mmm hh:mm */
- format = d_first ? "%e %b %R " : "%b %e %R ";
+ format = d_first ? "%e %b %R" : "%b %e %R";
else
/* mmm dd yyyy || dd mmm yyyy */
- format = d_first ? "%e %b %Y " : "%b %e %Y ";
+ format = d_first ? "%e %b %Y" : "%b %e %Y";
strftime(longstring, sizeof(longstring), format, localtime(&ftime));
fputs(longstring, stdout);
+ fputc(' ', stdout);
}
static int
@@ -625,7 +628,7 @@
snprintf(name, sizeof(name), "%s", p->fts_name);
else
snprintf(name, sizeof(name), "%s/%s",
- p->fts_parent->fts_accpath, p->fts_name);
+ p->fts_parent->fts_accpath, p->fts_name);
/*
* We have no way to tell whether a symbolic link has an ACL since
* pathconf() and acl_get_file() both follow them. They also don't
==== //depot/projects/qingli_mpath/src/bin/ls/util.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.40 2006/03/24 16:38:02 jhb Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.41 2008/04/04 05:55:42 ru Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -222,9 +222,9 @@
{
(void)fprintf(stderr,
#ifdef COLORLS
- "usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1]"
+ "usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1] [-D format]"
#else
- "usage: ls [-ABCFHILPRSTUWZabcdfghiklmnopqrstuwx1]"
+ "usage: ls [-ABCFHILPRSTUWZabcdfghiklmnopqrstuwx1] [-D format]"
#endif
" [file ...]\n");
exit(1);
==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/alloca.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/cddl/compat/opensolaris/include/alloca.h,v 1.1 2007/11/28 21:40:07 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/alloca.h,v 1.2 2008/03/28 22:16:04 jb Exp $
*
*/
==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/fcntl.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/cddl/compat/opensolaris/include/fcntl.h,v 1.1 2007/11/28 21:40:07 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/fcntl.h,v 1.2 2008/03/28 22:16:04 jb Exp $
*
*/
==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/fsshare.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/cddl/compat/opensolaris/include/fsshare.h,v 1.1 2007/04/06 01:08:58 pjd Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/fsshare.h,v 1.2 2008/03/28 22:16:04 jb Exp $
*/
#ifndef _OPENSOLARIS_FSSHARE_H_
==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/stdio.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/cddl/compat/opensolaris/include/stdio.h,v 1.1 2007/11/28 21:40:07 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/stdio.h,v 1.2 2008/03/28 22:16:04 jb Exp $
*
*/
==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/stdlib.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/cddl/compat/opensolaris/include/stdlib.h,v 1.1 2007/11/28 21:40:07 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/stdlib.h,v 1.2 2008/03/28 22:16:04 jb Exp $
*
*/
==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/strings.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/cddl/compat/opensolaris/include/strings.h,v 1.1 2007/11/28 21:40:07 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/strings.h,v 1.2 2008/03/28 22:16:04 jb Exp $
*
*/
==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/include/unistd.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/cddl/compat/opensolaris/include/unistd.h,v 1.1 2007/11/28 21:40:07 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/unistd.h,v 1.2 2008/03/28 22:16:04 jb Exp $
*
*/
==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/deviceid.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/deviceid.c,v 1.1 2007/05/06 01:39:38 pjd Exp $");
+__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/deviceid.c,v 1.2 2008/03/28 22:16:05 jb Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/fsshare.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/fsshare.c,v 1.2 2007/04/21 13:17:23 pjd Exp $");
+__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/fsshare.c,v 1.3 2008/03/28 22:16:05 jb Exp $");
#include <sys/param.h>
#include <stdio.h>
==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/mnttab.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/mnttab.c,v 1.1 2007/04/06 01:08:59 pjd Exp $");
+__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/mnttab.c,v 1.2 2008/03/28 22:16:05 jb Exp $");
#include <sys/param.h>
#include <sys/mount.h>
==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/zmount.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/zmount.c,v 1.1 2007/04/06 01:08:59 pjd Exp $");
+__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/zmount.c,v 1.2 2008/03/28 22:16:05 jb Exp $");
#include <sys/param.h>
#include <sys/mount.h>
==== //depot/projects/qingli_mpath/src/cddl/compat/opensolaris/misc/zone.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/cddl/compat/opensolaris/misc/zone.c,v 1.1 2007/04/06 01:08:59 pjd Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/misc/zone.c,v 1.2 2008/03/28 22:16:05 jb Exp $
*/
#include <stdlib.h>
==== //depot/projects/qingli_mpath/src/cddl/lib/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/lib/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $
+# $FreeBSD: src/cddl/lib/Makefile,v 1.8 2008/03/29 17:44:40 ru Exp $
.include <bsd.own.mk>
@@ -11,7 +11,7 @@
.if ${MK_ZFS} != "no"
_libzfs= libzfs
-.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"
+.if ${MK_LIBTHR} != "no"
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list