From owner-svn-src-all@FreeBSD.ORG Mon Dec 9 13:44:07 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DA2072C5; Mon, 9 Dec 2013 13:44:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BB45E1AD7; Mon, 9 Dec 2013 13:44:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB9Di7wF023310; Mon, 9 Dec 2013 13:44:07 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB9Di7Lt023309; Mon, 9 Dec 2013 13:44:07 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312091344.rB9Di7Lt023309@svn.freebsd.org> From: Glen Barber Date: Mon, 9 Dec 2013 13:44:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259128 - in releng/10.0: . contrib/ipfilter contrib/top share/man/man4 share/mk sys/amd64/include sys/contrib/dev/acpica sys/contrib/ipfilter/netinet sys/dev/fdt sys/x86/include X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Dec 2013 13:44:07 -0000 Author: gjb Date: Mon Dec 9 13:44:07 2013 New Revision: 259128 URL: http://svnweb.freebsd.org/changeset/base/259128 Log: Remove svn:mergeinfo from the releng/10.0 branch. After branch creation from stable/10, the stable/10 branch mergeinfo was moved to the root of the branch. Since there have not been any merges from stable/10 to releng/10.0 yet, we do not need to track any of the existing mergeinfo here. Merges to releng/10.0 should now be done to the root of the branch. For future branches during the release cycle, unless otherwise noted, this change will be done as part of the stable/ and releng/ branch creation. Discussed with: peter Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: Directory Properties: releng/10.0/ (props changed) releng/10.0/MAINTAINERS (props changed) releng/10.0/Makefile.inc1 (props changed) releng/10.0/ObsoleteFiles.inc (props changed) releng/10.0/UPDATING (props changed) releng/10.0/bin/df/ (props changed) releng/10.0/bin/freebsd-version/ (props changed) releng/10.0/cddl/ (props changed) releng/10.0/cddl/contrib/opensolaris/ (props changed) releng/10.0/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ (props changed) releng/10.0/cddl/contrib/opensolaris/cmd/zfs/ (props changed) releng/10.0/cddl/contrib/opensolaris/lib/libzfs/ (props changed) releng/10.0/contrib/apr/ (props changed) releng/10.0/contrib/apr-util/ (props changed) releng/10.0/contrib/atf/ (props changed) releng/10.0/contrib/binutils/ (props changed) releng/10.0/contrib/bmake/ (props changed) releng/10.0/contrib/byacc/ (props changed) releng/10.0/contrib/bzip2/ (props changed) releng/10.0/contrib/com_err/ (props changed) releng/10.0/contrib/compiler-rt/ (props changed) releng/10.0/contrib/dialog/ (props changed) releng/10.0/contrib/dtc/ (props changed) releng/10.0/contrib/ee/ (props changed) releng/10.0/contrib/expat/ (props changed) releng/10.0/contrib/file/ (props changed) releng/10.0/contrib/gcc/ (props changed) releng/10.0/contrib/gdb/ (props changed) releng/10.0/contrib/gdtoa/ (props changed) releng/10.0/contrib/groff/ (props changed) releng/10.0/contrib/ipfilter/ (props changed) releng/10.0/contrib/ipfilter/ml_ipl.c (props changed) releng/10.0/contrib/ipfilter/mlfk_ipl.c (props changed) releng/10.0/contrib/ipfilter/mlh_rule.c (props changed) releng/10.0/contrib/ipfilter/mli_ipl.c (props changed) releng/10.0/contrib/ipfilter/mln_ipl.c (props changed) releng/10.0/contrib/ipfilter/mls_ipl.c (props changed) releng/10.0/contrib/ldns/ (props changed) releng/10.0/contrib/less/ (props changed) releng/10.0/contrib/libarchive/ (props changed) releng/10.0/contrib/libarchive/cpio/ (props changed) releng/10.0/contrib/libarchive/libarchive/ (props changed) releng/10.0/contrib/libarchive/libarchive_fe/ (props changed) releng/10.0/contrib/libarchive/tar/ (props changed) releng/10.0/contrib/libc++/ (props changed) releng/10.0/contrib/libc-vis/ (props changed) releng/10.0/contrib/libcxxrt/ (props changed) releng/10.0/contrib/libexecinfo/ (props changed) releng/10.0/contrib/libpcap/ (props changed) releng/10.0/contrib/libstdc++/ (props changed) releng/10.0/contrib/llvm/ (props changed) releng/10.0/contrib/llvm/tools/clang/ (props changed) releng/10.0/contrib/mtree/ (props changed) releng/10.0/contrib/ncurses/ (props changed) releng/10.0/contrib/netcat/ (props changed) releng/10.0/contrib/ntp/ (props changed) releng/10.0/contrib/nvi/ (props changed) releng/10.0/contrib/one-true-awk/ (props changed) releng/10.0/contrib/openbsm/ (props changed) releng/10.0/contrib/openpam/ (props changed) releng/10.0/contrib/openresolv/ (props changed) releng/10.0/contrib/pf/ (props changed) releng/10.0/contrib/sendmail/ (props changed) releng/10.0/contrib/serf/ (props changed) releng/10.0/contrib/smbfs/ (props changed) releng/10.0/contrib/subversion/ (props changed) releng/10.0/contrib/tcpdump/ (props changed) releng/10.0/contrib/tcsh/ (props changed) releng/10.0/contrib/tnftp/ (props changed) releng/10.0/contrib/top/ (props changed) releng/10.0/contrib/top/install-sh (props changed) releng/10.0/contrib/tzcode/stdtime/ (props changed) releng/10.0/contrib/tzcode/zic/ (props changed) releng/10.0/contrib/tzdata/ (props changed) releng/10.0/contrib/unbound/ (props changed) releng/10.0/contrib/wpa/ (props changed) releng/10.0/contrib/xz/ (props changed) releng/10.0/crypto/heimdal/ (props changed) releng/10.0/crypto/openssh/ (props changed) releng/10.0/crypto/openssl/ (props changed) releng/10.0/etc/ (props changed) releng/10.0/etc/rc.d/ (props changed) releng/10.0/gnu/lib/ (props changed) releng/10.0/gnu/usr.bin/binutils/ (props changed) releng/10.0/gnu/usr.bin/cc/cc_tools/ (props changed) releng/10.0/gnu/usr.bin/gdb/ (props changed) releng/10.0/include/ (props changed) releng/10.0/lib/ (props changed) releng/10.0/lib/libc/ (props changed) releng/10.0/lib/libc/stdtime/ (props changed) releng/10.0/lib/libc_nonshared/ (props changed) releng/10.0/lib/libfetch/ (props changed) releng/10.0/lib/libiconv_modules/ (props changed) releng/10.0/lib/libsmb/ (props changed) releng/10.0/lib/libthr/ (props changed) releng/10.0/lib/libutil/ (props changed) releng/10.0/lib/libvmmapi/ (props changed) releng/10.0/lib/libyaml/ (props changed) releng/10.0/lib/libz/ (props changed) releng/10.0/release/ (props changed) releng/10.0/release/doc/ (props changed) releng/10.0/sbin/ (props changed) releng/10.0/sbin/camcontrol/ (props changed) releng/10.0/sbin/dumpon/ (props changed) releng/10.0/sbin/hastd/ (props changed) releng/10.0/sbin/ifconfig/ (props changed) releng/10.0/sbin/ipfw/ (props changed) releng/10.0/sbin/nvmecontrol/ (props changed) releng/10.0/share/ (props changed) releng/10.0/share/examples/bhyve/ (props changed) releng/10.0/share/i18n/csmapper/JIS/ (props changed) releng/10.0/share/i18n/esdb/EUC/ (props changed) releng/10.0/share/man/ (props changed) releng/10.0/share/man/man4/ (props changed) releng/10.0/share/man/man4/bhyve.4 (props changed) releng/10.0/share/man/man5/ (props changed) releng/10.0/share/man/man7/ (props changed) releng/10.0/share/man/man8/ (props changed) releng/10.0/share/misc/ (props changed) releng/10.0/share/mk/ (props changed) releng/10.0/share/mk/bsd.arch.inc.mk (props changed) releng/10.0/share/syscons/ (props changed) releng/10.0/share/zoneinfo/ (props changed) releng/10.0/sys/ (props changed) releng/10.0/sys/amd64/include/vmm.h (props changed) releng/10.0/sys/amd64/include/vmm_dev.h (props changed) releng/10.0/sys/amd64/include/vmm_instruction_emul.h (props changed) releng/10.0/sys/amd64/include/xen/ (props changed) releng/10.0/sys/amd64/vmm/ (props changed) releng/10.0/sys/boot/ (props changed) releng/10.0/sys/boot/i386/efi/ (props changed) releng/10.0/sys/boot/ia64/efi/ (props changed) releng/10.0/sys/boot/ia64/ski/ (props changed) releng/10.0/sys/boot/powerpc/boot1.chrp/ (props changed) releng/10.0/sys/boot/powerpc/ofw/ (props changed) releng/10.0/sys/cddl/contrib/opensolaris/ (props changed) releng/10.0/sys/conf/ (props changed) releng/10.0/sys/contrib/dev/acpica/ (props changed) releng/10.0/sys/contrib/dev/acpica/changes.txt (props changed) releng/10.0/sys/contrib/dev/acpica/common/ (props changed) releng/10.0/sys/contrib/dev/acpica/compiler/ (props changed) releng/10.0/sys/contrib/dev/acpica/components/debugger/ (props changed) releng/10.0/sys/contrib/dev/acpica/components/disassembler/ (props changed) releng/10.0/sys/contrib/dev/acpica/components/dispatcher/ (props changed) releng/10.0/sys/contrib/dev/acpica/components/events/ (props changed) releng/10.0/sys/contrib/dev/acpica/components/executer/ (props changed) releng/10.0/sys/contrib/dev/acpica/components/hardware/ (props changed) releng/10.0/sys/contrib/dev/acpica/components/namespace/ (props changed) releng/10.0/sys/contrib/dev/acpica/components/parser/ (props changed) releng/10.0/sys/contrib/dev/acpica/components/resources/ (props changed) releng/10.0/sys/contrib/dev/acpica/components/tables/ (props changed) releng/10.0/sys/contrib/dev/acpica/components/utilities/ (props changed) releng/10.0/sys/contrib/dev/acpica/include/ (props changed) releng/10.0/sys/contrib/dev/acpica/os_specific/ (props changed) releng/10.0/sys/contrib/ipfilter/ (props changed) releng/10.0/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (props changed) releng/10.0/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c (props changed) releng/10.0/sys/contrib/libfdt/ (props changed) releng/10.0/sys/contrib/octeon-sdk/ (props changed) releng/10.0/sys/contrib/x86emu/ (props changed) releng/10.0/sys/dev/bvm/ (props changed) releng/10.0/sys/dev/fdt/fdt_ic_if.m (props changed) releng/10.0/sys/dev/hyperv/ (props changed) releng/10.0/sys/modules/hyperv/ (props changed) releng/10.0/sys/modules/vmm/ (props changed) releng/10.0/sys/x86/include/acpica_machdep.h (props changed) releng/10.0/tools/ (props changed) releng/10.0/tools/build/ (props changed) releng/10.0/tools/build/options/ (props changed) releng/10.0/tools/tools/atsectl/ (props changed) releng/10.0/usr.bin/calendar/ (props changed) releng/10.0/usr.bin/csup/ (props changed) releng/10.0/usr.bin/iscsictl/ (props changed) releng/10.0/usr.bin/procstat/ (props changed) releng/10.0/usr.sbin/ (props changed) releng/10.0/usr.sbin/bhyve/ (props changed) releng/10.0/usr.sbin/bhyvectl/ (props changed) releng/10.0/usr.sbin/bhyveload/ (props changed) releng/10.0/usr.sbin/bsdconfig/ (props changed) releng/10.0/usr.sbin/bsdinstall/ (props changed) releng/10.0/usr.sbin/ctladm/ (props changed) releng/10.0/usr.sbin/ctld/ (props changed) releng/10.0/usr.sbin/freebsd-update/ (props changed) releng/10.0/usr.sbin/jail/ (props changed) releng/10.0/usr.sbin/mergemaster/ (props changed) releng/10.0/usr.sbin/mount_smbfs/ (props changed) releng/10.0/usr.sbin/ndiscvt/ (props changed) releng/10.0/usr.sbin/pkg/ (props changed) releng/10.0/usr.sbin/rtadvctl/ (props changed) releng/10.0/usr.sbin/rtadvd/ (props changed) releng/10.0/usr.sbin/rtsold/ (props changed) releng/10.0/usr.sbin/zic/ (props changed)