Diffusion FreeBSD src repository - subversion rS289134

Revert r289133; retry the merge
rS289134
Actions

Description

Revert r289133; retry the merge

Details

Provenance

ngie	Authored on

Parents

rS289133: MFhead @ r289132

Branches

Unknown

Tags

Unknown

Event Timeline

ngie committed rS289134: Revert r289133; retry the merge.Oct 11 2015, 8:26 AM

Changes (83)

Path

Size

user/

ngie/

more-tests2/

Makefile.inc1

contrib/

dma/

dma.lintian-overrides

lib/

libarchive/

tests/

sys/

libexec/

dma/

Makefile.inc

dmagent/

Makefile

sbin

geom/

class/

nop/

gnop.8

mdconfig/

mdconfig.8

mdconfig.c

man/

man4/

mk/

dev/

cxgbe/

iw_cxgbe/

cm.c

drm2/

i915/

iicbus/

wpi/

geom/

nop/

kern/

mips/

conf/

AP135.hints

TP-MR3020

TP-MR3020.hints

usr.bin/

cpio/

tests/

Makefile

functional_test.sh

tar/

tests/

Makefile

functional_test.sh

usr.sbin/

ppp/

Makefile

rS289134

View Options

user/ngie/more-tests2/

View Options

user/ngie/more-tests2/Makefile.inc1

View Options

user/ngie/more-tests2/contrib/dma/

View Options

user/ngie/more-tests2/contrib/dma/BSDmakefile

View Options

user/ngie/more-tests2/contrib/dma/LICENSE

View Options

user/ngie/more-tests2/contrib/dma/README.markdown

View Options

user/ngie/more-tests2/contrib/dma/TODO

View Options

user/ngie/more-tests2/contrib/dma/VERSION

View Options

user/ngie/more-tests2/contrib/dma/aliases_parse.y

View Options

user/ngie/more-tests2/contrib/dma/aliases_scan.l

View Options

user/ngie/more-tests2/contrib/dma/conf.c

View Options

user/ngie/more-tests2/contrib/dma/debian/

View Options

user/ngie/more-tests2/contrib/dma/debian/NEWS

View Options

user/ngie/more-tests2/contrib/dma/debian/README.Debian

View Options

user/ngie/more-tests2/contrib/dma/debian/changelog

View Options

user/ngie/more-tests2/contrib/dma/debian/compat

View Options

user/ngie/more-tests2/contrib/dma/debian/control

View Options

user/ngie/more-tests2/contrib/dma/debian/copyright

View Options

user/ngie/more-tests2/contrib/dma/debian/dma-migrate.dirs

View Options

user/ngie/more-tests2/contrib/dma/debian/dma-migrate.install

View Options

user/ngie/more-tests2/contrib/dma/debian/dma-migrate.manpages

View Options

user/ngie/more-tests2/contrib/dma/debian/dma.dirs

View Options

user/ngie/more-tests2/contrib/dma/debian/dma.links

View Options

user/ngie/more-tests2/contrib/dma/debian/dma.lintian-overrides

View Options

user/ngie/more-tests2/contrib/dma/debian/migrate/

View Options

user/ngie/more-tests2/contrib/dma/debian/migrate/Makefile

View Options

user/ngie/more-tests2/contrib/dma/debian/migrate/NEWS

View Options

user/ngie/more-tests2/contrib/dma/debian/migrate/dma-migrate.8

View Options

user/ngie/more-tests2/contrib/dma/debian/migrate/dma-migrate.c

View Options

user/ngie/more-tests2/contrib/dma/debian/rules

View Options

user/ngie/more-tests2/contrib/dma/debian/source/

View Options

user/ngie/more-tests2/contrib/dma/debian/source/format

View Options

user/ngie/more-tests2/contrib/dma/debian/source/options

View Options

user/ngie/more-tests2/contrib/dma/dma-mbox-create.c

View Options

user/ngie/more-tests2/contrib/dma/dma.8

View Options

user/ngie/more-tests2/contrib/dma/dma.c

View Options

user/ngie/more-tests2/contrib/dma/dma.h

View Options

user/ngie/more-tests2/contrib/dma/dns.c

View Options

user/ngie/more-tests2/contrib/dma/get-version.sh

View Options

user/ngie/more-tests2/contrib/dma/local.c

View Options

user/ngie/more-tests2/contrib/dma/mail.c

View Options

user/ngie/more-tests2/contrib/dma/net.c

View Options

user/ngie/more-tests2/contrib/dma/spool.c

View Options

user/ngie/more-tests2/contrib/dma/util.c

View Options

user/ngie/more-tests2/lib/libarchive/tests/

View Options

user/ngie/more-tests2/lib/libarchive/tests/Makefile

View Options

user/ngie/more-tests2/lib/libarchive/tests/functional_test.sh

View Options

user/ngie/more-tests2/lib/libc/

View Options

user/ngie/more-tests2/lib/libc/sys/shmctl.2

View Options

user/ngie/more-tests2/libexec/dma/Makefile.inc

View Options

user/ngie/more-tests2/libexec/dma/dmagent/Makefile

View Options

user/ngie/more-tests2/sbin/

View Options

user/ngie/more-tests2/sbin/geom/class/nop/gnop.8

View Options

user/ngie/more-tests2/sbin/mdconfig/mdconfig.8

View Options

user/ngie/more-tests2/sbin/mdconfig/mdconfig.c

View Options

user/ngie/more-tests2/share/

View Options

user/ngie/more-tests2/share/man/man4/

View Options

user/ngie/more-tests2/share/man/man4/vtnet.4

View Options

user/ngie/more-tests2/share/mk/Makefile

View Options

user/ngie/more-tests2/share/mk/bsd.confs.mk

View Options

user/ngie/more-tests2/share/mk/bsd.own.mk

View Options

user/ngie/more-tests2/sys/

View Options

user/ngie/more-tests2/sys/dev/cxgbe/iw_cxgbe/cm.c

View Options

user/ngie/more-tests2/sys/dev/drm2/i915/i915_gem.c

View Options

user/ngie/more-tests2/sys/dev/iicbus/icee.c

View Options

user/ngie/more-tests2/sys/dev/iicbus/iiconf.h

View Options

user/ngie/more-tests2/sys/dev/wpi/if_wpi.c

View Options

user/ngie/more-tests2/sys/dev/wpi/if_wpireg.h

View Options

user/ngie/more-tests2/sys/dev/wpi/if_wpivar.h

View Options

user/ngie/more-tests2/sys/geom/nop/g_nop.c

View Options

user/ngie/more-tests2/sys/geom/nop/g_nop.h

View Options

user/ngie/more-tests2/sys/kern/kern_module.c

View Options

user/ngie/more-tests2/sys/kern/sysv_shm.c

View Options

user/ngie/more-tests2/sys/mips/conf/AP135.hints

View Options

user/ngie/more-tests2/sys/mips/conf/TP-MR3020

View Options

user/ngie/more-tests2/sys/mips/conf/TP-MR3020.hints

View Options

user/ngie/more-tests2/usr.bin/cpio/tests/

View Options

user/ngie/more-tests2/usr.bin/cpio/tests/Makefile

View Options

user/ngie/more-tests2/usr.bin/cpio/tests/functional_test.sh

View Options

user/ngie/more-tests2/usr.bin/tar/tests/

View Options

user/ngie/more-tests2/usr.bin/tar/tests/Makefile

View Options

user/ngie/more-tests2/usr.bin/tar/tests/functional_test.sh

View Options

user/ngie/more-tests2/usr.sbin/ppp/Makefile

Revert r289133; retry the mergerS289134Actions

Description

Details

Event Timeline

Changes (83)

rS289134

user/ngie/more-tests2/

user/ngie/more-tests2/Makefile.inc1

user/ngie/more-tests2/contrib/dma/

user/ngie/more-tests2/contrib/dma/BSDmakefile

user/ngie/more-tests2/contrib/dma/LICENSE

user/ngie/more-tests2/contrib/dma/README.markdown

user/ngie/more-tests2/contrib/dma/TODO

user/ngie/more-tests2/contrib/dma/VERSION

user/ngie/more-tests2/contrib/dma/aliases_parse.y

user/ngie/more-tests2/contrib/dma/aliases_scan.l

user/ngie/more-tests2/contrib/dma/conf.c

user/ngie/more-tests2/contrib/dma/debian/

user/ngie/more-tests2/contrib/dma/debian/NEWS

user/ngie/more-tests2/contrib/dma/debian/README.Debian

user/ngie/more-tests2/contrib/dma/debian/changelog

user/ngie/more-tests2/contrib/dma/debian/compat

user/ngie/more-tests2/contrib/dma/debian/control

user/ngie/more-tests2/contrib/dma/debian/copyright

user/ngie/more-tests2/contrib/dma/debian/dma-migrate.dirs

user/ngie/more-tests2/contrib/dma/debian/dma-migrate.install

user/ngie/more-tests2/contrib/dma/debian/dma-migrate.manpages

user/ngie/more-tests2/contrib/dma/debian/dma.dirs

user/ngie/more-tests2/contrib/dma/debian/dma.links

user/ngie/more-tests2/contrib/dma/debian/dma.lintian-overrides

user/ngie/more-tests2/contrib/dma/debian/migrate/

user/ngie/more-tests2/contrib/dma/debian/migrate/Makefile

user/ngie/more-tests2/contrib/dma/debian/migrate/NEWS

user/ngie/more-tests2/contrib/dma/debian/migrate/dma-migrate.8

user/ngie/more-tests2/contrib/dma/debian/migrate/dma-migrate.c

user/ngie/more-tests2/contrib/dma/debian/rules

user/ngie/more-tests2/contrib/dma/debian/source/

user/ngie/more-tests2/contrib/dma/debian/source/format

user/ngie/more-tests2/contrib/dma/debian/source/options

user/ngie/more-tests2/contrib/dma/dma-mbox-create.c

user/ngie/more-tests2/contrib/dma/dma.8

user/ngie/more-tests2/contrib/dma/dma.c

user/ngie/more-tests2/contrib/dma/dma.h

user/ngie/more-tests2/contrib/dma/dns.c

user/ngie/more-tests2/contrib/dma/get-version.sh

user/ngie/more-tests2/contrib/dma/local.c

user/ngie/more-tests2/contrib/dma/mail.c

user/ngie/more-tests2/contrib/dma/net.c

user/ngie/more-tests2/contrib/dma/spool.c

user/ngie/more-tests2/contrib/dma/util.c

user/ngie/more-tests2/lib/libarchive/tests/

user/ngie/more-tests2/lib/libarchive/tests/Makefile

user/ngie/more-tests2/lib/libarchive/tests/functional_test.sh

user/ngie/more-tests2/lib/libc/

user/ngie/more-tests2/lib/libc/sys/shmctl.2

user/ngie/more-tests2/libexec/dma/Makefile.inc

user/ngie/more-tests2/libexec/dma/dmagent/Makefile

user/ngie/more-tests2/sbin/

user/ngie/more-tests2/sbin/geom/class/nop/gnop.8

user/ngie/more-tests2/sbin/mdconfig/mdconfig.8

user/ngie/more-tests2/sbin/mdconfig/mdconfig.c

user/ngie/more-tests2/share/

user/ngie/more-tests2/share/man/man4/

user/ngie/more-tests2/share/man/man4/vtnet.4

user/ngie/more-tests2/share/mk/Makefile

user/ngie/more-tests2/share/mk/bsd.confs.mk

user/ngie/more-tests2/share/mk/bsd.own.mk

user/ngie/more-tests2/sys/

user/ngie/more-tests2/sys/dev/cxgbe/iw_cxgbe/cm.c

user/ngie/more-tests2/sys/dev/drm2/i915/i915_gem.c

user/ngie/more-tests2/sys/dev/iicbus/icee.c

user/ngie/more-tests2/sys/dev/iicbus/iiconf.h

user/ngie/more-tests2/sys/dev/wpi/if_wpi.c

user/ngie/more-tests2/sys/dev/wpi/if_wpireg.h

user/ngie/more-tests2/sys/dev/wpi/if_wpivar.h

user/ngie/more-tests2/sys/geom/nop/g_nop.c

user/ngie/more-tests2/sys/geom/nop/g_nop.h

user/ngie/more-tests2/sys/kern/kern_module.c

user/ngie/more-tests2/sys/kern/sysv_shm.c

user/ngie/more-tests2/sys/mips/conf/AP135.hints

Revert r289133; retry the merge
rS289134
Actions