CVS commit: [pgoyette-localcount] src/sys/dev/pci

2017-04-25 Thread Paul Goyette
Module Name:src Committed By: pgoyette Date: Wed Apr 26 05:52:57 UTC 2017 Modified Files: src/sys/dev/pci [pgoyette-localcount]: pcidevs.h pcidevs_data.h Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.1246.2.5 -r1.1246.2.6

CVS commit: [pgoyette-localcount] src/sys/dev/pci

2017-04-25 Thread Paul Goyette
Module Name:src Committed By: pgoyette Date: Wed Apr 26 05:35:36 UTC 2017 Modified Files: src/sys/dev/pci [pgoyette-localcount]: pcidevs Log Message: Somehow this got out of sync on the branch. To generate a diff of this commit: cvs rdiff -u -r1.1253.2.5 -r1.1253.2.6

CVS commit: [pgoyette-localcount] src/sys/dev/pci

2017-04-25 Thread Paul Goyette
Module Name:src Committed By: pgoyette Date: Wed Apr 26 05:35:36 UTC 2017 Modified Files: src/sys/dev/pci [pgoyette-localcount]: pcidevs Log Message: Somehow this got out of sync on the branch. To generate a diff of this commit: cvs rdiff -u -r1.1253.2.5 -r1.1253.2.6

CVS commit: src/sys/dev/pci

2017-04-25 Thread SAITOH Masanobu
Module Name:src Committed By: msaitoh Date: Wed Apr 26 03:54:37 UTC 2017 Modified Files: src/sys/dev/pci: ppb.c Log Message: Disable and disestablish interrupt in ppbdetach(). To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/ppb.c Please

CVS commit: src/sys/dev/pci

2017-04-25 Thread SAITOH Masanobu
Module Name:src Committed By: msaitoh Date: Wed Apr 26 03:54:37 UTC 2017 Modified Files: src/sys/dev/pci: ppb.c Log Message: Disable and disestablish interrupt in ppbdetach(). To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/ppb.c Please

CVS commit: src/sys/opencrypto

2017-04-25 Thread Kengo NAKAHARA
Module Name:src Committed By: knakahara Date: Wed Apr 26 03:29:37 UTC 2017 Modified Files: src/sys/opencrypto: crypto.c Log Message: When crypto request is deferred processing, opencrypto should not return error. When the crypto device blocks a crypto request, opnecrypto

CVS commit: src/sys/opencrypto

2017-04-25 Thread Kengo NAKAHARA
Module Name:src Committed By: knakahara Date: Wed Apr 26 03:29:37 UTC 2017 Modified Files: src/sys/opencrypto: crypto.c Log Message: When crypto request is deferred processing, opencrypto should not return error. When the crypto device blocks a crypto request, opnecrypto

CVS commit: src/crypto/dist/ipsec-tools/src/libipsec

2017-04-25 Thread Ryota Ozaki
Module Name:src Committed By: ozaki-r Date: Wed Apr 26 03:19:49 UTC 2017 Modified Files: src/crypto/dist/ipsec-tools/src/libipsec: pfkey_dump.c Log Message: Print protocol number as well as its name ex.) before: "reserved" -> after: "255(reserved)" The original author

CVS commit: src/crypto/dist/ipsec-tools/src/libipsec

2017-04-25 Thread Ryota Ozaki
Module Name:src Committed By: ozaki-r Date: Wed Apr 26 03:19:49 UTC 2017 Modified Files: src/crypto/dist/ipsec-tools/src/libipsec: pfkey_dump.c Log Message: Print protocol number as well as its name ex.) before: "reserved" -> after: "255(reserved)" The original author

CVS commit: src

2017-04-25 Thread Ryota Ozaki
Module Name:src Committed By: ozaki-r Date: Wed Apr 26 03:16:06 UTC 2017 Modified Files: src/crypto/dist/ipsec-tools/src/libipsec: key_debug.c src/sys/netipsec: key_debug.c Log Message: Correct the length of the SADB_EXT header in debug outputs The length is

CVS commit: src

2017-04-25 Thread Ryota Ozaki
Module Name:src Committed By: ozaki-r Date: Wed Apr 26 03:16:06 UTC 2017 Modified Files: src/crypto/dist/ipsec-tools/src/libipsec: key_debug.c src/sys/netipsec: key_debug.c Log Message: Correct the length of the SADB_EXT header in debug outputs The length is

CVS commit: src/sys

2017-04-25 Thread Taylor R Campbell
Module Name:src Committed By: riastradh Date: Wed Apr 26 03:04:25 UTC 2017 Modified Files: src/sys/kern: vnode_if.c src/sys/rump/include/rump: rumpvnode_if.h src/sys/rump/librump/rumpvfs: rumpvnode_if.c src/sys/sys: vnode_if.h Log Message: regen

CVS commit: src/sys

2017-04-25 Thread Taylor R Campbell
Module Name:src Committed By: riastradh Date: Wed Apr 26 03:04:25 UTC 2017 Modified Files: src/sys/kern: vnode_if.c src/sys/rump/include/rump: rumpvnode_if.h src/sys/rump/librump/rumpvfs: rumpvnode_if.c src/sys/sys: vnode_if.h Log Message: regen

CVS commit: src

2017-04-25 Thread Taylor R Campbell
Module Name:src Committed By: riastradh Date: Wed Apr 26 03:02:49 UTC 2017 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_vnops.c src/lib/libp2k: p2k.c src/sys/coda: coda_vnops.c src/sys/compat/svr4: svr4_stream.c

CVS commit: src

2017-04-25 Thread Taylor R Campbell
Module Name:src Committed By: riastradh Date: Wed Apr 26 03:02:49 UTC 2017 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_vnops.c src/lib/libp2k: p2k.c src/sys/coda: coda_vnops.c src/sys/compat/svr4: svr4_stream.c

CVS commit: [pgoyette-localcount] src/sys

2017-04-25 Thread Paul Goyette
Module Name:src Committed By: pgoyette Date: Wed Apr 26 02:57:17 UTC 2017 Modified Files: src/sys/arch/sh3/include [pgoyette-localcount]: ieeefp.h src/sys/dev/pci [pgoyette-localcount]: piixpm.c Log Message: Resolve a couple of conflicts To generate a diff of

CVS commit: [pgoyette-localcount] src/sys

2017-04-25 Thread Paul Goyette
Module Name:src Committed By: pgoyette Date: Wed Apr 26 02:57:17 UTC 2017 Modified Files: src/sys/arch/sh3/include [pgoyette-localcount]: ieeefp.h src/sys/dev/pci [pgoyette-localcount]: piixpm.c Log Message: Resolve a couple of conflicts To generate a diff of

CVS commit: src/sys

2017-04-25 Thread Jared D. McNeill
Module Name:src Committed By: jmcneill Date: Wed Apr 26 01:51:53 UTC 2017 Modified Files: src/sys/arch/evbarm/conf: TEGRA src/sys/dev/fdt: fdtbus.c fdtvar.h files.fdt Log Message: Allow for specifying (optional) pass number locator for devices at fdt. To

CVS commit: src/sys

2017-04-25 Thread Jared D. McNeill
Module Name:src Committed By: jmcneill Date: Wed Apr 26 01:51:53 UTC 2017 Modified Files: src/sys/arch/evbarm/conf: TEGRA src/sys/dev/fdt: fdtbus.c fdtvar.h files.fdt Log Message: Allow for specifying (optional) pass number locator for devices at fdt. To

CVS commit: src/sys/arch/arm/nvidia

2017-04-25 Thread Jared D. McNeill
Module Name:src Committed By: jmcneill Date: Wed Apr 26 01:43:00 UTC 2017 Modified Files: src/sys/arch/arm/nvidia: tegra124_car.c Log Message: Set host1x parent to pll_p_out0 To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12

CVS commit: src/sys/arch/arm/nvidia

2017-04-25 Thread Jared D. McNeill
Module Name:src Committed By: jmcneill Date: Wed Apr 26 01:42:46 UTC 2017 Modified Files: src/sys/arch/arm/nvidia: tegra_drm_mode.c Log Message: Ignore dc parent clock from devicetree and use hdmi parent for dc. To generate a diff of this commit: cvs rdiff -u -r1.13

CVS commit: src/sys/arch/arm/nvidia

2017-04-25 Thread Jared D. McNeill
Module Name:src Committed By: jmcneill Date: Wed Apr 26 01:42:46 UTC 2017 Modified Files: src/sys/arch/arm/nvidia: tegra_drm_mode.c Log Message: Ignore dc parent clock from devicetree and use hdmi parent for dc. To generate a diff of this commit: cvs rdiff -u -r1.13

CVS commit: src/sys/arch/arm/nvidia

2017-04-25 Thread Jared D. McNeill
Module Name:src Committed By: jmcneill Date: Wed Apr 26 01:43:00 UTC 2017 Modified Files: src/sys/arch/arm/nvidia: tegra124_car.c Log Message: Set host1x parent to pll_p_out0 To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12

CVS commit: [netbsd-6-0] src/doc

2017-04-25 Thread Soren Jacobsen
Module Name:src Committed By: snj Date: Tue Apr 25 22:15:57 UTC 2017 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.7 Log Message: 1449 To generate a diff of this commit: cvs rdiff -u -r1.1.2.89 -r1.1.2.90 src/doc/CHANGES-6.0.7 Please note that diffs are not public

CVS commit: [netbsd-6-0] src/doc

2017-04-25 Thread Soren Jacobsen
Module Name:src Committed By: snj Date: Tue Apr 25 22:15:57 UTC 2017 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.7 Log Message: 1449 To generate a diff of this commit: cvs rdiff -u -r1.1.2.89 -r1.1.2.90 src/doc/CHANGES-6.0.7 Please note that diffs are not public

CVS commit: src/sys/kern

2017-04-25 Thread Paul Goyette
Module Name:src Committed By: pgoyette Date: Tue Apr 25 22:07:10 UTC 2017 Modified Files: src/sys/kern: kern_sysctl.c Log Message: Add a check to ensure that a new sysctl node was attached in the tree at the place we expected it to be attached! As mentioned several times

CVS commit: src/sys/kern

2017-04-25 Thread Paul Goyette
Module Name:src Committed By: pgoyette Date: Tue Apr 25 22:07:10 UTC 2017 Modified Files: src/sys/kern: kern_sysctl.c Log Message: Add a check to ensure that a new sysctl node was attached in the tree at the place we expected it to be attached! As mentioned several times

CVS commit: [pgoyette-localcount] src/sys/kern

2017-04-25 Thread Paul Goyette
Module Name:src Committed By: pgoyette Date: Tue Apr 25 21:53:06 UTC 2017 Modified Files: src/sys/kern [pgoyette-localcount]: subr_devsw.c Log Message: Use {b,c}devsw_acquire() and {b,c}devsw_release() in the various device acccess methods. To generate a diff of this

CVS commit: [pgoyette-localcount] src/sys/kern

2017-04-25 Thread Paul Goyette
Module Name:src Committed By: pgoyette Date: Tue Apr 25 21:53:06 UTC 2017 Modified Files: src/sys/kern [pgoyette-localcount]: subr_devsw.c Log Message: Use {b,c}devsw_acquire() and {b,c}devsw_release() in the various device acccess methods. To generate a diff of this

CVS commit: [pgoyette-localcount] src/sys/kern

2017-04-25 Thread Paul Goyette
Module Name:src Committed By: pgoyette Date: Tue Apr 25 21:36:41 UTC 2017 Modified Files: src/sys/kern [pgoyette-localcount]: subr_devsw.c Log Message: Add membar_datadep_consumer() to {b,c}devsw_lookup() to ensure that the devsw content is visible. Again, thanks

CVS commit: [pgoyette-localcount] src/sys/kern

2017-04-25 Thread Paul Goyette
Module Name:src Committed By: pgoyette Date: Tue Apr 25 21:36:41 UTC 2017 Modified Files: src/sys/kern [pgoyette-localcount]: subr_devsw.c Log Message: Add membar_datadep_consumer() to {b,c}devsw_lookup() to ensure that the devsw content is visible. Again, thanks

CVS commit: [pgoyette-localcount] src/sys/kern

2017-04-25 Thread Paul Goyette
Module Name:src Committed By: pgoyette Date: Tue Apr 25 21:31:33 UTC 2017 Modified Files: src/sys/kern [pgoyette-localcount]: subr_devsw.c Log Message: Call localcount_init() before publishing the new {b,c}devsw. Thanks to riastradh@ To generate a diff of this commit:

CVS commit: [pgoyette-localcount] src/sys/kern

2017-04-25 Thread Paul Goyette
Module Name:src Committed By: pgoyette Date: Tue Apr 25 21:31:33 UTC 2017 Modified Files: src/sys/kern [pgoyette-localcount]: subr_devsw.c Log Message: Call localcount_init() before publishing the new {b,c}devsw. Thanks to riastradh@ To generate a diff of this commit:

CVS commit: [netbsd-6-1] src/doc

2017-04-25 Thread Soren Jacobsen
Module Name:src Committed By: snj Date: Tue Apr 25 21:01:03 UTC 2017 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.6 Log Message: 1449 To generate a diff of this commit: cvs rdiff -u -r1.1.2.87 -r1.1.2.88 src/doc/CHANGES-6.1.6 Please note that diffs are not public

CVS commit: [netbsd-6-1] src/doc

2017-04-25 Thread Soren Jacobsen
Module Name:src Committed By: snj Date: Tue Apr 25 21:01:03 UTC 2017 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.6 Log Message: 1449 To generate a diff of this commit: cvs rdiff -u -r1.1.2.87 -r1.1.2.88 src/doc/CHANGES-6.1.6 Please note that diffs are not public

CVS commit: [jdolecek-ncq] src/sys/dev/ic

2017-04-25 Thread Jaromir Dolecek
Module Name:src Committed By: jdolecek Date: Tue Apr 25 20:55:05 UTC 2017 Modified Files: src/sys/dev/ic [jdolecek-ncq]: ahcisata_core.c Log Message: make compile without DIAGNOSTIC To generate a diff of this commit: cvs rdiff -u -r1.57.6.11 -r1.57.6.12

CVS commit: [jdolecek-ncq] src/sys/dev/ic

2017-04-25 Thread Jaromir Dolecek
Module Name:src Committed By: jdolecek Date: Tue Apr 25 20:55:05 UTC 2017 Modified Files: src/sys/dev/ic [jdolecek-ncq]: ahcisata_core.c Log Message: make compile without DIAGNOSTIC To generate a diff of this commit: cvs rdiff -u -r1.57.6.11 -r1.57.6.12

CVS commit: [netbsd-6] src/doc

2017-04-25 Thread Soren Jacobsen
Module Name:src Committed By: snj Date: Tue Apr 25 20:04:21 UTC 2017 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: 1449 To generate a diff of this commit: cvs rdiff -u -r1.1.2.280 -r1.1.2.281 src/doc/CHANGES-6.2 Please note that diffs are not public

CVS commit: [netbsd-6] src/doc

2017-04-25 Thread Soren Jacobsen
Module Name:src Committed By: snj Date: Tue Apr 25 20:04:21 UTC 2017 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: 1449 To generate a diff of this commit: cvs rdiff -u -r1.1.2.280 -r1.1.2.281 src/doc/CHANGES-6.2 Please note that diffs are not public

CVS commit: [netbsd-6] src/external/bsd/bind

2017-04-25 Thread Soren Jacobsen
Module Name:src Committed By: snj Date: Tue Apr 25 19:54:35 UTC 2017 Modified Files: src/external/bsd/bind/dist [netbsd-6]: CHANGES COPYRIGHT FAQ FAQ.xml Makefile.in README acconfig.h bind.keys config.h.in config.h.win32 configure configure.in

CVS commit: [netbsd-6] src/external/bsd/bind

2017-04-25 Thread Soren Jacobsen
Module Name:src Committed By: snj Date: Tue Apr 25 19:54:35 UTC 2017 Modified Files: src/external/bsd/bind/dist [netbsd-6]: CHANGES COPYRIGHT FAQ FAQ.xml Makefile.in README acconfig.h bind.keys config.h.in config.h.win32 configure configure.in

CVS commit: src/sys/arch/evbarm/conf

2017-04-25 Thread Sevan Janiyan
Module Name:src Committed By: sevan Date: Tue Apr 25 18:52:31 UTC 2017 Modified Files: src/sys/arch/evbarm/conf: BEAGLEBONE Log Message: Switch BEAGLEBONE config over to using GENERIC.common. Remove duplicates already defined in GENERIC.common. To generate a diff of

CVS commit: src/sys/arch/evbarm/conf

2017-04-25 Thread Sevan Janiyan
Module Name:src Committed By: sevan Date: Tue Apr 25 18:52:31 UTC 2017 Modified Files: src/sys/arch/evbarm/conf: BEAGLEBONE Log Message: Switch BEAGLEBONE config over to using GENERIC.common. Remove duplicates already defined in GENERIC.common. To generate a diff of

CVS commit: src/sys/dev/pci

2017-04-25 Thread Soren Jacobsen
Module Name:src Committed By: snj Date: Tue Apr 25 17:11:47 UTC 2017 Modified Files: src/sys/dev/pci: if_bge.c Log Message: fix typo To generate a diff of this commit: cvs rdiff -u -r1.308 -r1.309 src/sys/dev/pci/if_bge.c Please note that diffs are not public domain;

CVS commit: src/sys/dev/pci

2017-04-25 Thread Soren Jacobsen
Module Name:src Committed By: snj Date: Tue Apr 25 17:11:47 UTC 2017 Modified Files: src/sys/dev/pci: if_bge.c Log Message: fix typo To generate a diff of this commit: cvs rdiff -u -r1.308 -r1.309 src/sys/dev/pci/if_bge.c Please note that diffs are not public domain;

CVS commit: src/doc

2017-04-25 Thread Christos Zoulas
70423] + libc: Update to tzcode2017b. [christos 20170425]

CVS commit: src/doc

2017-04-25 Thread Christos Zoulas
Module Name:src Committed By: christos Date: Tue Apr 25 13:20:41 UTC 2017 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new tzcode. To generate a diff of this commit: cvs rdiff -u -r1.1437 -r1.1438 src/doc/3RDPARTY cvs rdiff -u -r1.2276 -r1.2277 src/doc/CHANGES

CVS commit: src/lib/libc/time

2017-04-25 Thread Christos Zoulas
Module Name:src Committed By: christos Date: Tue Apr 25 13:19:45 UTC 2017 Modified Files: src/lib/libc/time: NEWS tz-link.htm version Log Message: merge tzcode2017b. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/lib/libc/time/NEWS cvs rdiff -u -r1.30

CVS commit: src/lib/libc/time

2017-04-25 Thread Christos Zoulas
Module Name:src Committed By: christos Date: Tue Apr 25 13:19:45 UTC 2017 Modified Files: src/lib/libc/time: NEWS tz-link.htm version Log Message: merge tzcode2017b. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/lib/libc/time/NEWS cvs rdiff -u -r1.30

CVS commit: [pgoyette-localcount] src/sys/kern

2017-04-25 Thread Paul Goyette
Module Name:src Committed By: pgoyette Date: Tue Apr 25 09:03:03 UTC 2017 Modified Files: src/sys/kern [pgoyette-localcount]: subr_autoconf.c Log Message: Use KASSERTMSG() to ensure that the device has a localcount. To generate a diff of this commit: cvs rdiff -u

CVS commit: [pgoyette-localcount] src/sys/kern

2017-04-25 Thread Paul Goyette
Module Name:src Committed By: pgoyette Date: Tue Apr 25 09:03:03 UTC 2017 Modified Files: src/sys/kern [pgoyette-localcount]: subr_autoconf.c Log Message: Use KASSERTMSG() to ensure that the device has a localcount. To generate a diff of this commit: cvs rdiff -u

CVS commit: src/sys/arch/arm/arm

2017-04-25 Thread Nick Hudson
Module Name:src Committed By: skrll Date: Tue Apr 25 09:02:05 UTC 2017 Modified Files: src/sys/arch/arm/arm: db_trace.c Log Message: Report trapframe where possible To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/arm/db_trace.c Please

CVS commit: src/sys/arch/arm/arm32

2017-04-25 Thread Nick Hudson
Module Name:src Committed By: skrll Date: Tue Apr 25 09:02:34 UTC 2017 Modified Files: src/sys/arch/arm/arm32: db_machdep.c Log Message: Dump more of the trapframe To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/arm32/db_machdep.c Please

CVS commit: src/sys/arch/arm/arm32

2017-04-25 Thread Nick Hudson
Module Name:src Committed By: skrll Date: Tue Apr 25 09:02:34 UTC 2017 Modified Files: src/sys/arch/arm/arm32: db_machdep.c Log Message: Dump more of the trapframe To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/arm32/db_machdep.c Please

CVS commit: src/sys/arch/arm/arm

2017-04-25 Thread Nick Hudson
Module Name:src Committed By: skrll Date: Tue Apr 25 09:02:05 UTC 2017 Modified Files: src/sys/arch/arm/arm: db_trace.c Log Message: Report trapframe where possible To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/arm/db_trace.c Please

CVS commit: src/sys/arch/arm/include

2017-04-25 Thread Nick Hudson
Module Name:src Committed By: skrll Date: Tue Apr 25 09:01:38 UTC 2017 Modified Files: src/sys/arch/arm/include: frame.h Log Message: Expose lwp_trapframe for _KEMUSER, e.g. crash(8) To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19

CVS commit: src/sys/arch/arm/include

2017-04-25 Thread Nick Hudson
Module Name:src Committed By: skrll Date: Tue Apr 25 09:01:38 UTC 2017 Modified Files: src/sys/arch/arm/include: frame.h Log Message: Expose lwp_trapframe for _KEMUSER, e.g. crash(8) To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19

CVS commit: src/sys/kern

2017-04-25 Thread Paul Goyette
Module Name:src Committed By: pgoyette Date: Tue Apr 25 08:46:38 UTC 2017 Modified Files: src/sys/kern: subr_devsw.c Log Message: Use __func__ for routine name in printf() calls. NFC intended. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37

CVS commit: src/sys/kern

2017-04-25 Thread Paul Goyette
Module Name:src Committed By: pgoyette Date: Tue Apr 25 08:46:38 UTC 2017 Modified Files: src/sys/kern: subr_devsw.c Log Message: Use __func__ for routine name in printf() calls. NFC intended. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37

CVS commit: src/share/man/man3

2017-04-25 Thread Abhinav Upadhyay
Module Name:src Committed By: abhinav Date: Tue Apr 25 06:08:24 UTC 2017 Modified Files: src/share/man/man3: queue.3 Log Message: Use Fn instead of Nm to refer the macros in the body of the man page. Thanks to wiz@ for reviewing. To generate a diff of this commit: cvs

CVS commit: src/share/man/man3

2017-04-25 Thread Abhinav Upadhyay
Module Name:src Committed By: abhinav Date: Tue Apr 25 06:08:24 UTC 2017 Modified Files: src/share/man/man3: queue.3 Log Message: Use Fn instead of Nm to refer the macros in the body of the man page. Thanks to wiz@ for reviewing. To generate a diff of this commit: cvs