CVS commit: [pgoyette-compat] src

To: source-changes%NetBSD.org@localhost
Subject: CVS commit: [pgoyette-compat] src
From: "Paul Goyette" <pgoyette%netbsd.org@localhost>
Date: Fri, 30 Mar 2018 06:20:20 +0000
Module Name:    src
Committed By:   pgoyette
Date:           Fri Mar 30 06:20:17 UTC 2018

Modified Files:
        src/distrib/amd64/uefi-installimage [pgoyette-compat]: Makefile
        src/distrib/sets/lists/base [pgoyette-compat]: mi
        src/distrib/sets/lists/comp [pgoyette-compat]: md.sparc md.sparc64
        src/distrib/sets/lists/tests [pgoyette-compat]: mi
        src/distrib/sets/lists/xetc [pgoyette-compat]: md.x68k mi
        src/distrib/sparc/miniroot [pgoyette-compat]: Makefile.inc
        src/doc [pgoyette-compat]: 3RDPARTY CHANGES
        src/etc/mtree [pgoyette-compat]: NetBSD.dist.base
        src/external/bsd/dhcpcd/dist [pgoyette-compat]: configure
        src/external/bsd/dhcpcd/dist/hooks [pgoyette-compat]:
            dhcpcd-run-hooks.8.in
        src/external/bsd/dhcpcd/dist/src [pgoyette-compat]: arp.c common.h
            defs.h dhcp.c dhcp.h dhcp6.c dhcp6.h dhcpcd.c dhcpcd.conf.5.in
            dhcpcd.h if-bsd.c if-linux.c if-sun.c if.c if.h ipv4.c ipv4.h
            ipv6.c ipv6.h ipv6nd.c ipv6nd.h
        src/external/bsd/dhcpcd/include [pgoyette-compat]: config.h
        src/external/bsd/pkg_install/dist/add [pgoyette-compat]: perform.c
            pkg_add.1
        src/external/bsd/pkg_install/dist/admin [pgoyette-compat]: audit.c
            main.c pkg_admin.1
        src/external/bsd/pkg_install/dist/delete [pgoyette-compat]:
            pkg_delete.c
        src/external/bsd/pkg_install/dist/lib [pgoyette-compat]: lib.h
            license.c version.h vulnerabilities-file.c
        src/external/gpl3/binutils/dist/bfd [pgoyette-compat]: elflink.c
        src/external/gpl3/gcc.old/dist/gcc/config/i386 [pgoyette-compat]:
            constraints.md i386-opts.h i386-protos.h i386.c i386.h i386.md
            i386.opt predicates.md
        src/external/gpl3/gcc.old/dist/gcc/doc [pgoyette-compat]: extend.texi
            invoke.texi
        src/external/gpl3/gcc/dist/gcc/config/i386 [pgoyette-compat]:
            constraints.md i386-opts.h i386-protos.h i386.c i386.h i386.md
            i386.opt predicates.md
        src/external/gpl3/gcc/dist/gcc/doc [pgoyette-compat]: extend.texi
            invoke.texi
        src/external/public-domain/tz [pgoyette-compat]: tzdata2netbsd
        src/external/public-domain/tz/dist [pgoyette-compat]: CONTRIBUTING
            Makefile NEWS TZDATA_VERSION africa antarctica asia australasia
            backzone checktab.awk europe northamerica southamerica theory.html
            version zishrink.awk zone.tab zone1970.tab
        src/lib/csu/common [pgoyette-compat]: crt0-common.c
        src/lib/libm/src [pgoyette-compat]: s_scalbn.c
        src/libexec/ld.elf_so/arch/sparc [pgoyette-compat]: mdreloc.c
        src/libexec/ld.elf_so/arch/sparc64 [pgoyette-compat]: mdreloc.c
        src/sbin/raidctl [pgoyette-compat]: raidctl.c
        src/sbin/route [pgoyette-compat]: route.c
        src/share/man/man4/man4.sparc64 [pgoyette-compat]: ffb.4
        src/sys/arch/amd64/amd64 [pgoyette-compat]: amd64_trap.S locore.S
        src/sys/arch/amd64/conf [pgoyette-compat]: ALL GENERIC
        src/sys/arch/amd64/include [pgoyette-compat]: frameasm.h
        src/sys/arch/i386/conf [pgoyette-compat]: ALL
        src/sys/arch/i386/stand/efiboot [pgoyette-compat]: Makefile.efiboot
            boot.c efiboot.c efiboot.h eficons.c efidelay.c efidisk.c
            efimemory.c
        src/sys/arch/i386/stand/efiboot/bootia32 [pgoyette-compat]:
            efibootia32.c
        src/sys/arch/i386/stand/efiboot/bootx64 [pgoyette-compat]: efibootx64.c
        src/sys/arch/macppc/conf [pgoyette-compat]: POWERMAC_G5
        src/sys/arch/macppc/dev [pgoyette-compat]: obio.c pmu.c snapper.c
        src/sys/arch/macppc/macppc [pgoyette-compat]: cpu.c interrupts.c
        src/sys/arch/macppc/pci [pgoyette-compat]: uninorth.c
        src/sys/arch/mips/mips [pgoyette-compat]: locore.S
        src/sys/arch/powerpc/include [pgoyette-compat]: cpu.h spr.h
        src/sys/arch/powerpc/include/oea [pgoyette-compat]: cpufeat.h
        src/sys/arch/powerpc/oea [pgoyette-compat]: cpu_subr.c
        src/sys/arch/powerpc/pic [pgoyette-compat]: pic_openpic.c
        src/sys/arch/sgimips/mace [pgoyette-compat]: if_mec.c
        src/sys/arch/sparc/include [pgoyette-compat]: Makefile
        src/sys/arch/sparc64/dev [pgoyette-compat]: ffb.c
        src/sys/arch/sparc64/include [pgoyette-compat]: Makefile
        src/sys/arch/vax/boot [pgoyette-compat]: Makefile.inc
        src/sys/arch/vax/conf [pgoyette-compat]: majors.vax
        src/sys/arch/vax/vax [pgoyette-compat]: ka780.c
        src/sys/arch/x86/conf [pgoyette-compat]: files.x86
        src/sys/arch/x86/x86 [pgoyette-compat]: cpu.c cpu_ucode.c intr.c svs.c
        src/sys/dev/ic [pgoyette-compat]: ninjascsi32.c
        src/sys/dev/isa [pgoyette-compat]: lpt_isa.c
        src/sys/dev/pci [pgoyette-compat]: auich.c pcidevs pcidevs.h
            pcidevs_data.h
        src/sys/dev/pci/ixgbe [pgoyette-compat]: ix_txrx.c ixgbe.c ixgbe.h
            ixgbe_api.h ixgbe_common.c ixv.c
        src/sys/dev/sbus [pgoyette-compat]: mgx.c
        src/sys/dev/scsipi [pgoyette-compat]: st.c stvar.h
        src/sys/dev/usb [pgoyette-compat]: uts.c
        src/sys/net [pgoyette-compat]: route.c
        src/sys/net/npf [pgoyette-compat]: npf_alg_icmp.c npf_inet.c
        src/sys/netinet [pgoyette-compat]: tcp_congctl.c tcp_debug.c
            tcp_input.c tcp_output.c tcp_sack.c tcp_subr.c tcp_timer.c
            tcp_usrreq.c tcp_var.h
        src/sys/uvm [pgoyette-compat]: uvm_bio.c
        src/tests/net/icmp [pgoyette-compat]: t_ping.c
        src/tests/net/if_tap [pgoyette-compat]: t_tap.sh
        src/tests/net/ndp [pgoyette-compat]: t_ndp.sh
        src/tests/usr.bin/c++ [pgoyette-compat]: Makefile t_cxxruntime.sh
            t_hello.sh t_static_destructor.sh
        src/tools/gcc [pgoyette-compat]: gcc-version.mk
        src/usr.sbin/makefs/cd9660 [pgoyette-compat]: cd9660_eltorito.c
Added Files:
        src/external/public-domain/tz/dist [pgoyette-compat]: ziguard.awk
        src/sys/arch/i386/stand/efiboot [pgoyette-compat]: efichar.c
        src/sys/arch/sparc/include [pgoyette-compat]: elf_support.h
        src/sys/arch/sparc64/include [pgoyette-compat]: elf_support.h
        src/sys/arch/x86/x86 [pgoyette-compat]: spectre.c
        src/tests/usr.bin/c++ [pgoyette-compat]: t_call_once.sh t_call_once2.sh
            t_pthread_once.sh
Removed Files:
        src/external/bsd/pkg_install/dist [pgoyette-compat]: Makefile.in README
            config.guess config.sub configure configure.ac install-sh tkpkg
        src/external/bsd/pkg_install/dist/add [pgoyette-compat]: Makefile.in
            pkg_add.cat
        src/external/bsd/pkg_install/dist/admin [pgoyette-compat]: Makefile.in
            audit-packages.cat download-vulnerability-list.cat pkg_admin.cat
        src/external/bsd/pkg_install/dist/create [pgoyette-compat]: Makefile.in
            pkg_create.cat
        src/external/bsd/pkg_install/dist/delete [pgoyette-compat]: Makefile.in
            pkg_delete.cat
        src/external/bsd/pkg_install/dist/info [pgoyette-compat]: Makefile.in
            pkg_info.cat
        src/external/bsd/pkg_install/dist/lib [pgoyette-compat]: Makefile.in
            pkg_install.conf.cat.in pkg_summary.cat pkgsrc.cat
        src/external/mit/xorg/bin/rstart [pgoyette-compat]: Makefile
            Makefile.rstart
        src/external/mit/xorg/bin/rstart/commands [pgoyette-compat]: Makefile
        src/external/mit/xorg/bin/rstart/commands/x11r6 [pgoyette-compat]:
            Makefile
        src/external/mit/xorg/bin/rstart/contexts [pgoyette-compat]: Makefile

Log Message:
Resolve conflicts between branch and HEAD


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.2.1 src/distrib/amd64/uefi-installimage/Makefile
cvs rdiff -u -r1.1172 -r1.1172.2.1 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.92 -r1.92.2.1 src/distrib/sets/lists/comp/md.sparc
cvs rdiff -u -r1.199 -r1.199.2.1 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.775.2.1 -r1.775.2.2 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.4 -r1.4.24.1 src/distrib/sets/lists/xetc/md.x68k
cvs rdiff -u -r1.29 -r1.29.2.1 src/distrib/sets/lists/xetc/mi
cvs rdiff -u -r1.28 -r1.28.2.1 src/distrib/sparc/miniroot/Makefile.inc
cvs rdiff -u -r1.1504.2.1 -r1.1504.2.2 src/doc/3RDPARTY
cvs rdiff -u -r1.2363.2.2 -r1.2363.2.3 src/doc/CHANGES
cvs rdiff -u -r1.169 -r1.169.2.1 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.1.1.5 -r1.1.1.5.2.1 src/external/bsd/dhcpcd/dist/configure
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.2.1 \
    src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.8.in
cvs rdiff -u -r1.1.1.5 -r1.1.1.5.2.1 src/external/bsd/dhcpcd/dist/src/arp.c \
    src/external/bsd/dhcpcd/dist/src/ipv6.h
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.2.1 \
    src/external/bsd/dhcpcd/dist/src/common.h \
    src/external/bsd/dhcpcd/dist/src/dhcp6.h \
    src/external/bsd/dhcpcd/dist/src/if-sun.c \
    src/external/bsd/dhcpcd/dist/src/ipv4.h
cvs rdiff -u -r1.1.1.9 -r1.1.1.9.2.1 src/external/bsd/dhcpcd/dist/src/defs.h
cvs rdiff -u -r1.8 -r1.8.2.1 src/external/bsd/dhcpcd/dist/src/dhcp.c \
    src/external/bsd/dhcpcd/dist/src/dhcpcd.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 src/external/bsd/dhcpcd/dist/src/dhcp.h \
    src/external/bsd/dhcpcd/dist/src/dhcpcd.h \
    src/external/bsd/dhcpcd/dist/src/if.h \
    src/external/bsd/dhcpcd/dist/src/ipv6nd.h
cvs rdiff -u -r1.1.1.8 -r1.1.1.8.2.1 src/external/bsd/dhcpcd/dist/src/dhcp6.c
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.2.1 \
    src/external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in \
    src/external/bsd/dhcpcd/dist/src/if-bsd.c \
    src/external/bsd/dhcpcd/dist/src/if.c \
    src/external/bsd/dhcpcd/dist/src/ipv6nd.c
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.2.1 \
    src/external/bsd/dhcpcd/dist/src/if-linux.c \
    src/external/bsd/dhcpcd/dist/src/ipv4.c \
    src/external/bsd/dhcpcd/dist/src/ipv6.c
cvs rdiff -u -r1.2 -r1.2.2.1 src/external/bsd/dhcpcd/include/config.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/pkg_install/dist/Makefile.in \
    src/external/bsd/pkg_install/dist/README \
    src/external/bsd/pkg_install/dist/config.guess \
    src/external/bsd/pkg_install/dist/config.sub \
    src/external/bsd/pkg_install/dist/configure \
    src/external/bsd/pkg_install/dist/configure.ac \
    src/external/bsd/pkg_install/dist/install-sh \
    src/external/bsd/pkg_install/dist/tkpkg
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/pkg_install/dist/add/Makefile.in \
    src/external/bsd/pkg_install/dist/add/pkg_add.cat
cvs rdiff -u -r1.5 -r1.5.10.1 src/external/bsd/pkg_install/dist/add/perform.c
cvs rdiff -u -r1.2 -r1.2.10.1 src/external/bsd/pkg_install/dist/add/pkg_add.1
cvs rdiff -u -r1.1.1.1 -r0 \
    src/external/bsd/pkg_install/dist/admin/Makefile.in \
    src/external/bsd/pkg_install/dist/admin/audit-packages.cat \
    src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.cat \
    src/external/bsd/pkg_install/dist/admin/pkg_admin.cat
cvs rdiff -u -r1.2 -r1.2.10.1 src/external/bsd/pkg_install/dist/admin/audit.c \
    src/external/bsd/pkg_install/dist/admin/main.c \
    src/external/bsd/pkg_install/dist/admin/pkg_admin.1
cvs rdiff -u -r1.1.1.1 -r0 \
    src/external/bsd/pkg_install/dist/create/Makefile.in \
    src/external/bsd/pkg_install/dist/create/pkg_create.cat
cvs rdiff -u -r1.1.1.1 -r0 \
    src/external/bsd/pkg_install/dist/delete/Makefile.in \
    src/external/bsd/pkg_install/dist/delete/pkg_delete.cat
cvs rdiff -u -r1.2 -r1.2.10.1 \
    src/external/bsd/pkg_install/dist/delete/pkg_delete.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/pkg_install/dist/info/Makefile.in \
    src/external/bsd/pkg_install/dist/info/pkg_info.cat
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/pkg_install/dist/lib/Makefile.in \
    src/external/bsd/pkg_install/dist/lib/pkg_install.conf.cat.in \
    src/external/bsd/pkg_install/dist/lib/pkg_summary.cat \
    src/external/bsd/pkg_install/dist/lib/pkgsrc.cat
cvs rdiff -u -r1.8 -r1.8.10.1 src/external/bsd/pkg_install/dist/lib/lib.h
cvs rdiff -u -r1.6 -r1.6.2.1 src/external/bsd/pkg_install/dist/lib/license.c
cvs rdiff -u -r1.12 -r1.12.2.1 \
    src/external/bsd/pkg_install/dist/lib/version.h
cvs rdiff -u -r1.2 -r1.2.10.1 \
    src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c
cvs rdiff -u -r1.13 -r1.13.12.1 src/external/gpl3/binutils/dist/bfd/elflink.c
cvs rdiff -u -r1.5 -r1.5.2.1 \
    src/external/gpl3/gcc.old/dist/gcc/config/i386/constraints.md \
    src/external/gpl3/gcc.old/dist/gcc/config/i386/i386-protos.h \
    src/external/gpl3/gcc.old/dist/gcc/config/i386/predicates.md
cvs rdiff -u -r1.3 -r1.3.2.1 \
    src/external/gpl3/gcc.old/dist/gcc/config/i386/i386-opts.h
cvs rdiff -u -r1.9 -r1.9.2.1 \
    src/external/gpl3/gcc.old/dist/gcc/config/i386/i386.c
cvs rdiff -u -r1.6 -r1.6.2.1 \
    src/external/gpl3/gcc.old/dist/gcc/config/i386/i386.h \
    src/external/gpl3/gcc.old/dist/gcc/config/i386/i386.md \
    src/external/gpl3/gcc.old/dist/gcc/config/i386/i386.opt
cvs rdiff -u -r1.6 -r1.6.2.1 \
    src/external/gpl3/gcc.old/dist/gcc/doc/extend.texi \
    src/external/gpl3/gcc.old/dist/gcc/doc/invoke.texi
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.2.1 \
    src/external/gpl3/gcc/dist/gcc/config/i386/constraints.md
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.2.1 \
    src/external/gpl3/gcc/dist/gcc/config/i386/i386-opts.h
cvs rdiff -u -r1.1.1.5 -r1.1.1.5.2.1 \
    src/external/gpl3/gcc/dist/gcc/config/i386/i386-protos.h \
    src/external/gpl3/gcc/dist/gcc/config/i386/i386.opt \
    src/external/gpl3/gcc/dist/gcc/config/i386/predicates.md
cvs rdiff -u -r1.16 -r1.16.2.1 \
    src/external/gpl3/gcc/dist/gcc/config/i386/i386.c
cvs rdiff -u -r1.7 -r1.7.2.1 \
    src/external/gpl3/gcc/dist/gcc/config/i386/i386.h
cvs rdiff -u -r1.1.1.10 -r1.1.1.10.2.1 \
    src/external/gpl3/gcc/dist/gcc/config/i386/i386.md
cvs rdiff -u -r1.1.1.9 -r1.1.1.9.2.1 \
    src/external/gpl3/gcc/dist/gcc/doc/extend.texi
cvs rdiff -u -r1.14 -r1.14.2.1 src/external/gpl3/gcc/dist/gcc/doc/invoke.texi
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/bin/rstart/Makefile \
    src/external/mit/xorg/bin/rstart/Makefile.rstart
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/bin/rstart/commands/Makefile
cvs rdiff -u -r1.1 -r0 \
    src/external/mit/xorg/bin/rstart/commands/x11r6/Makefile
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/bin/rstart/contexts/Makefile
cvs rdiff -u -r1.11 -r1.11.12.1 src/external/public-domain/tz/tzdata2netbsd
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 \
    src/external/public-domain/tz/dist/CONTRIBUTING
cvs rdiff -u -r1.1.1.19 -r1.1.1.19.2.1 \
    src/external/public-domain/tz/dist/Makefile \
    src/external/public-domain/tz/dist/europe
cvs rdiff -u -r1.1.1.20 -r1.1.1.20.2.1 \
    src/external/public-domain/tz/dist/NEWS
cvs rdiff -u -r1.10 -r1.10.2.1 \
    src/external/public-domain/tz/dist/TZDATA_VERSION
cvs rdiff -u -r1.1.1.13 -r1.1.1.13.2.1 \
    src/external/public-domain/tz/dist/africa \
    src/external/public-domain/tz/dist/australasia \
    src/external/public-domain/tz/dist/backzone \
    src/external/public-domain/tz/dist/southamerica \
    src/external/public-domain/tz/dist/zone.tab
cvs rdiff -u -r1.1.1.9 -r1.1.1.9.2.1 \
    src/external/public-domain/tz/dist/antarctica
cvs rdiff -u -r1.1.1.18 -r1.1.1.18.2.1 \
    src/external/public-domain/tz/dist/asia \
    src/external/public-domain/tz/dist/northamerica
cvs rdiff -u -r1.1.1.8 -r1.1.1.8.14.1 \
    src/external/public-domain/tz/dist/checktab.awk
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.2.1 \
    src/external/public-domain/tz/dist/theory.html \
    src/external/public-domain/tz/dist/zishrink.awk
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.2.1 \
    src/external/public-domain/tz/dist/version
cvs rdiff -u -r0 -r1.1.1.1.10.2 \
    src/external/public-domain/tz/dist/ziguard.awk
cvs rdiff -u -r1.1.1.15 -r1.1.1.15.2.1 \
    src/external/public-domain/tz/dist/zone1970.tab
cvs rdiff -u -r1.14.14.1 -r1.14.14.2 src/lib/csu/common/crt0-common.c
cvs rdiff -u -r1.18 -r1.18.26.1 src/lib/libm/src/s_scalbn.c
cvs rdiff -u -r1.52 -r1.52.2.1 src/libexec/ld.elf_so/arch/sparc/mdreloc.c
cvs rdiff -u -r1.67 -r1.67.2.1 src/libexec/ld.elf_so/arch/sparc64/mdreloc.c
cvs rdiff -u -r1.66 -r1.66.2.1 src/sbin/raidctl/raidctl.c
cvs rdiff -u -r1.158 -r1.158.2.1 src/sbin/route/route.c
cvs rdiff -u -r1.2 -r1.2.42.1 src/share/man/man4/man4.sparc64/ffb.4
cvs rdiff -u -r1.37.2.1 -r1.37.2.2 src/sys/arch/amd64/amd64/amd64_trap.S
cvs rdiff -u -r1.157.2.1 -r1.157.2.2 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.82.2.1 -r1.82.2.2 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.485.2.1 -r1.485.2.2 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.37 -r1.37.2.1 src/sys/arch/amd64/include/frameasm.h
cvs rdiff -u -r1.434.2.1 -r1.434.2.2 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.9.10.1 -r1.9.10.2 \
    src/sys/arch/i386/stand/efiboot/Makefile.efiboot
cvs rdiff -u -r1.5.10.2 -r1.5.10.3 src/sys/arch/i386/stand/efiboot/boot.c
cvs rdiff -u -r1.4.18.1 -r1.4.18.2 src/sys/arch/i386/stand/efiboot/efiboot.c
cvs rdiff -u -r1.5.10.1 -r1.5.10.2 src/sys/arch/i386/stand/efiboot/efiboot.h
cvs rdiff -u -r0 -r1.1.2.2 src/sys/arch/i386/stand/efiboot/efichar.c
cvs rdiff -u -r1.4 -r1.4.10.1 src/sys/arch/i386/stand/efiboot/eficons.c
cvs rdiff -u -r1.1 -r1.1.20.1 src/sys/arch/i386/stand/efiboot/efidelay.c
cvs rdiff -u -r1.1.20.2 -r1.1.20.3 src/sys/arch/i386/stand/efiboot/efidisk.c
cvs rdiff -u -r1.4 -r1.4.18.1 src/sys/arch/i386/stand/efiboot/efimemory.c
cvs rdiff -u -r1.3 -r1.3.10.1 \
    src/sys/arch/i386/stand/efiboot/bootia32/efibootia32.c
cvs rdiff -u -r1.3 -r1.3.10.1 \
    src/sys/arch/i386/stand/efiboot/bootx64/efibootx64.c
cvs rdiff -u -r1.34.2.1 -r1.34.2.2 src/sys/arch/macppc/conf/POWERMAC_G5
cvs rdiff -u -r1.43 -r1.43.2.1 src/sys/arch/macppc/dev/obio.c \
    src/sys/arch/macppc/dev/snapper.c
cvs rdiff -u -r1.30 -r1.30.2.1 src/sys/arch/macppc/dev/pmu.c
cvs rdiff -u -r1.60 -r1.60.28.1 src/sys/arch/macppc/macppc/cpu.c
cvs rdiff -u -r1.5 -r1.5.34.1 src/sys/arch/macppc/macppc/interrupts.c
cvs rdiff -u -r1.18.16.1 -r1.18.16.2 src/sys/arch/macppc/pci/uninorth.c
cvs rdiff -u -r1.210.2.1 -r1.210.2.2 src/sys/arch/mips/mips/locore.S
cvs rdiff -u -r1.103 -r1.103.2.1 src/sys/arch/powerpc/include/cpu.h
cvs rdiff -u -r1.50 -r1.50.2.1 src/sys/arch/powerpc/include/spr.h
cvs rdiff -u -r1.4 -r1.4.86.1 src/sys/arch/powerpc/include/oea/cpufeat.h
cvs rdiff -u -r1.90 -r1.90.2.1 src/sys/arch/powerpc/oea/cpu_subr.c
cvs rdiff -u -r1.12 -r1.12.2.1 src/sys/arch/powerpc/pic/pic_openpic.c
cvs rdiff -u -r1.55 -r1.55.14.1 src/sys/arch/sgimips/mace/if_mec.c
cvs rdiff -u -r1.33 -r1.33.26.1 src/sys/arch/sparc/include/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/sys/arch/sparc/include/elf_support.h
cvs rdiff -u -r1.61 -r1.61.8.1 src/sys/arch/sparc64/dev/ffb.c
cvs rdiff -u -r1.30 -r1.30.26.1 src/sys/arch/sparc64/include/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/sys/arch/sparc64/include/elf_support.h
cvs rdiff -u -r1.17 -r1.17.16.1 src/sys/arch/vax/boot/Makefile.inc
cvs rdiff -u -r1.27 -r1.27.4.1 src/sys/arch/vax/conf/majors.vax
cvs rdiff -u -r1.32 -r1.32.16.1 src/sys/arch/vax/vax/ka780.c
cvs rdiff -u -r1.97.2.2 -r1.97.2.3 src/sys/arch/x86/conf/files.x86
cvs rdiff -u -r1.149.2.2 -r1.149.2.3 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.5.16.6 -r1.5.16.7 src/sys/arch/x86/x86/cpu_ucode.c
cvs rdiff -u -r1.123 -r1.123.2.1 src/sys/arch/x86/x86/intr.c
cvs rdiff -u -r0 -r1.5.2.2 src/sys/arch/x86/x86/spectre.c
cvs rdiff -u -r1.13.2.1 -r1.13.2.2 src/sys/arch/x86/x86/svs.c
cvs rdiff -u -r1.24 -r1.24.28.1 src/sys/dev/ic/ninjascsi32.c
cvs rdiff -u -r1.68 -r1.68.62.1 src/sys/dev/isa/lpt_isa.c
cvs rdiff -u -r1.151 -r1.151.8.1 src/sys/dev/pci/auich.c
cvs rdiff -u -r1.1319.2.1 -r1.1319.2.2 src/sys/dev/pci/pcidevs
cvs rdiff -u -r1.1311.2.1 -r1.1311.2.2 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1310.2.1 -r1.1310.2.2 src/sys/dev/pci/pcidevs_data.h
cvs rdiff -u -r1.34.2.1 -r1.34.2.2 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.128.2.2 -r1.128.2.3 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.32.2.1 -r1.32.2.2 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.11 -r1.11.2.1 src/sys/dev/pci/ixgbe/ixgbe_api.h
cvs rdiff -u -r1.16.2.2 -r1.16.2.3 src/sys/dev/pci/ixgbe/ixgbe_common.c
cvs rdiff -u -r1.84.2.2 -r1.84.2.3 src/sys/dev/pci/ixgbe/ixv.c
cvs rdiff -u -r1.12 -r1.12.4.1 src/sys/dev/sbus/mgx.c
cvs rdiff -u -r1.231 -r1.231.4.1 src/sys/dev/scsipi/st.c
cvs rdiff -u -r1.25 -r1.25.16.1 src/sys/dev/scsipi/stvar.h
cvs rdiff -u -r1.8 -r1.8.2.1 src/sys/dev/usb/uts.c
cvs rdiff -u -r1.206 -r1.206.2.1 src/sys/net/route.c
cvs rdiff -u -r1.25.2.1 -r1.25.2.2 src/sys/net/npf/npf_alg_icmp.c
cvs rdiff -u -r1.37.12.2 -r1.37.12.3 src/sys/net/npf/npf_inet.c
cvs rdiff -u -r1.23 -r1.23.14.1 src/sys/netinet/tcp_congctl.c
cvs rdiff -u -r1.30 -r1.30.16.1 src/sys/netinet/tcp_debug.c
cvs rdiff -u -r1.383 -r1.383.2.1 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.198.2.1 -r1.198.2.2 src/sys/netinet/tcp_output.c
cvs rdiff -u -r1.33 -r1.33.14.1 src/sys/netinet/tcp_sack.c
cvs rdiff -u -r1.273 -r1.273.2.1 src/sys/netinet/tcp_subr.c
cvs rdiff -u -r1.93 -r1.93.2.1 src/sys/netinet/tcp_timer.c
cvs rdiff -u -r1.216 -r1.216.2.1 src/sys/netinet/tcp_usrreq.c
cvs rdiff -u -r1.184 -r1.184.2.1 src/sys/netinet/tcp_var.h
cvs rdiff -u -r1.92 -r1.92.2.1 src/sys/uvm/uvm_bio.c
cvs rdiff -u -r1.17 -r1.17.12.1 src/tests/net/icmp/t_ping.c
cvs rdiff -u -r1.7 -r1.7.2.1 src/tests/net/if_tap/t_tap.sh
cvs rdiff -u -r1.30 -r1.30.2.1 src/tests/net/ndp/t_ndp.sh
cvs rdiff -u -r1.3 -r1.3.10.1 src/tests/usr.bin/c++/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/tests/usr.bin/c++/t_call_once.sh \
    src/tests/usr.bin/c++/t_call_once2.sh \
    src/tests/usr.bin/c++/t_pthread_once.sh
cvs rdiff -u -r1.2 -r1.2.10.1 src/tests/usr.bin/c++/t_cxxruntime.sh \
    src/tests/usr.bin/c++/t_hello.sh
cvs rdiff -u -r1.1 -r1.1.10.1 src/tests/usr.bin/c++/t_static_destructor.sh
cvs rdiff -u -r1.9 -r1.9.2.1 src/tools/gcc/gcc-version.mk
cvs rdiff -u -r1.22 -r1.22.2.1 src/usr.sbin/makefs/cd9660/cd9660_eltorito.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Prev by Date: CVS commit: [pgoyette-compat] src/sys/modules/compat_16
Next by Date: CVS commit: [pgoyette-compat] src/sys/compat/common
Previous by Thread: CVS commit: [pgoyette-compat] src/sys/modules/compat_16
Next by Thread: CVS commit: [pgoyette-compat] src/sys/compat/common
Indexes:
Home | Main Index | Thread Index | Old Index