CVS commit: src/sys/dev/pci

2016-08-14 Thread Matthias Scheler
Module Name:src
Committed By:   tron
Date:   Sun Aug 14 07:47:15 UTC 2016

Modified Files:
src/sys/dev/pci: virtio.c

Log Message:
Prevent a panic during system shutdown when vioif(4) is used


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/virtio.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/net

2016-08-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Aug 14 11:03:21 UTC 2016

Modified Files:
src/sys/net: if_tap.c

Log Message:
fix rump tests.


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/net/if_tap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/ufs/ext2fs

2016-08-14 Thread Jaromir Dolecek
Module Name:src
Committed By:   jdolecek
Date:   Sun Aug 14 11:25:36 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs_bmap.c

Log Message:
check correct inode extents flag - IN_E4EXTENTS is defined as 0x8000, correct 
flag EXT2_EXTENTS is 0x8


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/ufs/ext2fs/ext2fs_bmap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/ufs/ext2fs

2016-08-14 Thread Jaromir Dolecek
Module Name:src
Committed By:   jdolecek
Date:   Sun Aug 14 11:26:35 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs_bmap.c

Log Message:
whitespace cleanup


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/ufs/ext2fs/ext2fs_bmap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/ufs/ufs

2016-08-14 Thread Jaromir Dolecek
Module Name:src
Committed By:   jdolecek
Date:   Sun Aug 14 11:31:41 UTC 2016

Modified Files:
src/sys/ufs/ufs: inode.h

Log Message:
again remove IN_E4EXTENTS; it's not used anywhere any more, and it's better to 
keep fs-specific flags out of generic headers anyway


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/ufs/ufs/inode.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/ufs/ext2fs

2016-08-14 Thread Jaromir Dolecek
Module Name:src
Committed By:   jdolecek
Date:   Sun Aug 14 11:40:31 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs.h ext2fs_xattr.c

Log Message:
add EXT2F_HAS_ROCOMPAT_FEATURE() macro, and change the current 
EXT2F_HAS_{COMPAT|INCOMPAT}_FEATURE() to take fs as first parameter


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/ufs/ext2fs/ext2fs.h
cvs rdiff -u -r1.2 -r1.3 src/sys/ufs/ext2fs/ext2fs_xattr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/ufs/ext2fs

2016-08-14 Thread Jaromir Dolecek
Module Name:src
Committed By:   jdolecek
Date:   Sun Aug 14 11:42:50 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs.h ext2fs_htree.c

Log Message:
switch ext2fs_htree_has_idx() over to EXT2F_HAS_COMPAT_FEATURE() and remove 
EXT2F_HAS_COMPAT_FEATURE() - this also fixes it for BE machines, as 
EXT2F_HAS_COMPAT_FEATURE() did extra byte swap; also remove XXX comment about 
IN_E3INDEX


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/ufs/ext2fs/ext2fs.h
cvs rdiff -u -r1.5 -r1.6 src/sys/ufs/ext2fs/ext2fs_htree.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/ufs/ext2fs

2016-08-14 Thread Jaromir Dolecek
Module Name:src
Committed By:   jdolecek
Date:   Sun Aug 14 11:44:54 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs_inode.c ext2fs_lookup.c ext2fs_vfsops.c
ext2fs_vnops.c

Log Message:
switch code to use the EXT2_HAS_{COMPAT|ROCOMPAT|INCOMPAT}_FEATURE() macros 
instead of open coding the checks


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/ufs/ext2fs/ext2fs_inode.c
cvs rdiff -u -r1.84 -r1.85 src/sys/ufs/ext2fs/ext2fs_lookup.c
cvs rdiff -u -r1.198 -r1.199 src/sys/ufs/ext2fs/ext2fs_vfsops.c
cvs rdiff -u -r1.122 -r1.123 src/sys/ufs/ext2fs/ext2fs_vnops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/ufs/ext2fs

2016-08-14 Thread Jaromir Dolecek
Module Name:src
Committed By:   jdolecek
Date:   Sun Aug 14 11:46:06 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs_lookup.c

Log Message:
when converting on-disk direntry, only use the on-disk filetype if the feature 
flag is present


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/ufs/ext2fs/ext2fs_lookup.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys

2016-08-14 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sun Aug 14 14:42:22 UTC 2016

Modified Files:
src/sys/dev/usb: ehci.c ohci.c usb.c usbdi.h
src/sys/external/bsd/dwc2: dwc2.c

Log Message:
Change the SOFTINT level from NET to SERIAL for the USB softint handler.
This gives the callback a chance of running when another softint handler
at SOFTINT_NET has blocked holding a lock, e.g. softnet_lock and most of
the network stack.

Should fix/help
kern/49065 - ifconfig tun0 ... sequence locks up system / lockup: softnet_lock 
held across usb xfr
kern/50491 - unkillable wait in usbd_transfer while using usmsc0 on raspberry 
pi 2
kern/51395 - USB Ethernet makes xhci hang

and probably others


To generate a diff of this commit:
cvs rdiff -u -r1.252 -r1.253 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.263 -r1.264 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.163 -r1.164 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.91 -r1.92 src/sys/dev/usb/usbdi.h
cvs rdiff -u -r1.43 -r1.44 src/sys/external/bsd/dwc2/dwc2.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src

2016-08-14 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Sun Aug 14 14:55:42 UTC 2016

Modified Files:
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/dev: Makefile
Added Files:
src/tests/dev/clock_subr: Makefile clock_subr_test_data_gen.sh
t_clock_subr.c

Log Message:
tests for sys/dev/clock_subr.c


To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.680 -r1.681 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.129 -r1.130 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.11 -r1.12 src/tests/dev/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/dev/clock_subr/Makefile \
src/tests/dev/clock_subr/clock_subr_test_data_gen.sh \
src/tests/dev/clock_subr/t_clock_subr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/gpl3/gcc/usr.bin/host-libcpp

2016-08-14 Thread Thor Lancelot Simon
Module Name:src
Committed By:   tls
Date:   Sun Aug 14 16:04:50 UTC 2016

Modified Files:
src/external/gpl3/gcc/usr.bin/host-libcpp: Makefile

Log Message:
Disable iconv in host-libcpp autoconf: fixes build on Mac OS X.
Thanks to joerg@ for the diagnosis and proposed fix.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/usr.bin/host-libcpp/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/external/bsd/acpica/dist/include

2016-08-14 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Sun Aug 14 19:03:28 UTC 2016

Modified Files:
src/sys/external/bsd/acpica/dist/include: acoutput.h

Log Message:
ACPI_TRACE_ENTRY adds const for the type argument, so don't duplicate it
in ACPI_FUNCTION_TRACE_STR.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/acpica/dist/include/acoutput.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/regress/sys/crypto/des_asm

2016-08-14 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Sun Aug 14 19:05:24 UTC 2016

Modified Files:
src/regress/sys/crypto/des_asm: Makefile

Log Message:
Since the i386-specific DES assembly is not PIC, don't build this as PIE.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/regress/sys/crypto/des_asm/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/bin/echo

2016-08-14 Thread Sevan Janiyan
Module Name:src
Committed By:   sevan
Date:   Sun Aug 14 22:59:22 UTC 2016

Modified Files:
src/bin/echo: echo.1

Log Message:
While the v2 source and man pages are incomplete, TUHS has a scanned copy of the
printed version of the 2nd edition manual. echo is featured in this copy.
http://www.tuhs.org/Archive/PDP-11/Distributions/research/1972_stuff/unix_2nd_edition_manual.pdf
Ammend HISTORY and bump date.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/bin/echo/echo.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/share/misc

2016-08-14 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Sun Aug 14 23:07:04 UTC 2016

Modified Files:
src/share/misc: acronyms.comp

Log Message:
BTS is for "bug tracking system", but it's not for "bits per second", or
at least not that either I or the Goog have heard of.


To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/share/misc/acronyms.comp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/bin/stty

2016-08-14 Thread Sevan Janiyan
Module Name:src
Committed By:   sevan
Date:   Sun Aug 14 23:29:43 UTC 2016

Modified Files:
src/bin/stty: stty.1

Log Message:
While the v2 source and man pages are incomplete, TUHS has a scanned copy of the
printed version of the 2nd edition manual. stty is featured in this copy, in the
table of contents listed as meaning "set typewriter modes" and on the actual 
manual page
headed correctly as "set teletype options"
http://www.tuhs.org/Archive/PDP-11/Distributions/research/1972_stuff/unix_2nd_edition_manual.pdf
Ammend HISTORY and bump date.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/bin/stty/stty.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/dump

2016-08-14 Thread Sevan Janiyan
Module Name:src
Committed By:   sevan
Date:   Mon Aug 15 00:03:14 UTC 2016

Modified Files:
src/sbin/dump: dump.8

Log Message:
dump was there from v4.
Confirmed from the TUHS hosted copies of man pages.
Bump date.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sbin/dump/dump.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS import: xsrc/external/mit/xf86-video-nouveau/dist

2016-08-14 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 15 01:10:31 UTC 2016

Update of /cvsroot/xsrc/external/mit/xf86-video-nouveau/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv28461

Log Message:
initial import of xf86-video-nouveau-1.0.12

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-nouveau-1-0-12

U xsrc/external/mit/xf86-video-nouveau/dist/COPYING
U xsrc/external/mit/xf86-video-nouveau/dist/install-sh
U xsrc/external/mit/xf86-video-nouveau/dist/configure.ac
U xsrc/external/mit/xf86-video-nouveau/dist/depcomp
U xsrc/external/mit/xf86-video-nouveau/dist/ChangeLog
U xsrc/external/mit/xf86-video-nouveau/dist/missing
U xsrc/external/mit/xf86-video-nouveau/dist/config.guess
U xsrc/external/mit/xf86-video-nouveau/dist/ltmain.sh
U xsrc/external/mit/xf86-video-nouveau/dist/configure
U xsrc/external/mit/xf86-video-nouveau/dist/Makefile.am
U xsrc/external/mit/xf86-video-nouveau/dist/Makefile.in
U xsrc/external/mit/xf86-video-nouveau/dist/aclocal.m4
U xsrc/external/mit/xf86-video-nouveau/dist/compile
U xsrc/external/mit/xf86-video-nouveau/dist/config.sub
U xsrc/external/mit/xf86-video-nouveau/dist/INSTALL
U xsrc/external/mit/xf86-video-nouveau/dist/config.h.in
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_const.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_rop.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_present.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv10_exa.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_accel.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_dma.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_present.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy90b5.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_local.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_accel.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv40_xv_tex.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy85b5.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_type.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_dri2.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv30_exa.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_sync.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_shadow.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_proto.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_exa.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_accel.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_sync.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_accel.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_xv_ovl.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_xv.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv40_exa.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_xv_blit.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_exa.c
C xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_accel_common.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copya0b5.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_accel.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv10_xv_ovl.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_exa.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_include.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv30_xv_tex.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_wfb.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_exa.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_xv.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_xv.c
U xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs/nv_object.xml.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs/nvc0_m2mf.xml.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs/nv10_3d.xml.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs/nvc0_3d.xml.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs/nv50_texture.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs/nv50_3d.xml.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs/nv_m2mf.xml.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs/nv30-40_3d.xml.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs/nv01_2d.xml.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs/nv_3ddefs.xml.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs/nv50_2d.xml.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs/nv50_defs.xml.h
U xsrc/external/mit/xf86-video-nouveau/dist/src/shader/exaca

CVS commit: xsrc/external/mit/xf86-video-nouveau/dist/src

2016-08-14 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 15 01:11:10 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-nouveau/dist/src: drmmode_display.c
Removed Files:
xsrc/external/mit/xf86-video-nouveau/dist/src: nouveau_glamor.c
nouveau_glamor.h

Log Message:
merge xf86-video-nouveau-1.0.12


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_glamor.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_glamor.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS import: xsrc/external/mit/xf86-video-r128/dist

2016-08-14 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 15 03:04:43 UTC 2016

Update of /cvsroot/xsrc/external/mit/xf86-video-r128/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv5750

Log Message:
initial import of xf86-video-r128-6.10.1

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-r128-6-10-1

U xsrc/external/mit/xf86-video-r128/dist/ChangeLog
U xsrc/external/mit/xf86-video-r128/dist/COPYING
U xsrc/external/mit/xf86-video-r128/dist/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/INSTALL
U xsrc/external/mit/xf86-video-r128/dist/missing
U xsrc/external/mit/xf86-video-r128/dist/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/README
U xsrc/external/mit/xf86-video-r128/dist/aclocal.m4
U xsrc/external/mit/xf86-video-r128/dist/compile
U xsrc/external/mit/xf86-video-r128/dist/config.guess
U xsrc/external/mit/xf86-video-r128/dist/config.h.in
U xsrc/external/mit/xf86-video-r128/dist/config.sub
U xsrc/external/mit/xf86-video-r128/dist/configure
U xsrc/external/mit/xf86-video-r128/dist/configure.ac
U xsrc/external/mit/xf86-video-r128/dist/depcomp
U xsrc/external/mit/xf86-video-r128/dist/install-sh
U xsrc/external/mit/xf86-video-r128/dist/ltmain.sh
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/man/r128.man
U xsrc/external/mit/xf86-video-r128/dist/src/atipcirename.h
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/src/r128_common.h
U xsrc/external/mit/xf86-video-r128/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_accel.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_cursor.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_crtc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dripriv.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa_render.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_reg.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c
C xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_misc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_version.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_sarea.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_video.c

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-r128/dist



CVS commit: xsrc/external/mit/xf86-video-r128/dist/src

2016-08-14 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 15 03:06:07 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-r128/dist/src: r128_output.c

Log Message:
merge xf86-video-r128 6.10.1


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/net

2016-08-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Aug 15 05:10:33 UTC 2016

Modified Files:
src/sys/net: if_tap.c

Log Message:
remove MODULAR/COMPAT_40 ifdef.


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/net/if_tap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.