CVS commit: src/share/man/man4

2015-08-07 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Fri Aug  7 07:14:43 UTC 2015

Modified Files:
src/share/man/man4: options.4

Log Message:
Remove the malloc debug options. They no longer exist.


To generate a diff of this commit:
cvs rdiff -u -r1.445 -r1.446 src/share/man/man4/options.4

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



CVS commit: src/sys/arch

2015-08-07 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Fri Aug  7 07:29:34 UTC 2015

Modified Files:
src/sys/arch/alpha/conf: RAWHIDE
src/sys/arch/evbarm/conf: IMX31LITE IXM1200 NAPPI OSK5912 TEAMASA_NPWR
VIPER
src/sys/arch/evbmips/conf: ADM5120 ADM5120-NB ADM5120-USB RB153
WGT624V3
src/sys/arch/evbppc/conf: VIRTEX_DFC VIRTEX_GSRD1 VIRTEX_GSRD2
src/sys/arch/evbsh3/conf: AP_MS104_SH4 T_SH7706LAN T_SH7706LSR
src/sys/arch/ia64/conf: GENERIC GENERIC.SKI
src/sys/arch/mac68k/conf: SMALLRAM
src/sys/arch/news68k/conf: NEWS1200
src/sys/arch/next68k/conf: SLAB
src/sys/arch/playstation2/conf: DEBUG
src/sys/arch/shark/conf: OFWGENCFG
src/sys/arch/sun3/conf: DISKLESS DISKLESS3X INSTALL INSTALL3X

Log Message:
Remove the KMEMSTATS option. It no longer exists.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/alpha/conf/RAWHIDE
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/conf/IMX31LITE
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/evbarm/conf/IXM1200
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/evbarm/conf/NAPPI
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/conf/OSK5912
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/evbarm/conf/TEAMASA_NPWR
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/conf/VIPER
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbmips/conf/ADM5120
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbmips/conf/ADM5120-NB \
src/sys/arch/evbmips/conf/ADM5120-USB
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbmips/conf/RB153
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbmips/conf/WGT624V3
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbppc/conf/VIRTEX_DFC
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbppc/conf/VIRTEX_GSRD1
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbppc/conf/VIRTEX_GSRD2
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbsh3/conf/AP_MS104_SH4
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbsh3/conf/T_SH7706LAN
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbsh3/conf/T_SH7706LSR
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/conf/GENERIC
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ia64/conf/GENERIC.SKI
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/mac68k/conf/SMALLRAM
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/news68k/conf/NEWS1200
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/next68k/conf/SLAB
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/playstation2/conf/DEBUG
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/shark/conf/OFWGENCFG
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/sun3/conf/DISKLESS
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/sun3/conf/DISKLESS3X \
src/sys/arch/sun3/conf/INSTALL3X
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/sun3/conf/INSTALL

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



CVS commit: src/share/man/man4

2015-08-07 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Fri Aug  7 07:34:56 UTC 2015

Modified Files:
src/share/man/man4: options.4

Log Message:
Remove KMEMSTATS


To generate a diff of this commit:
cvs rdiff -u -r1.446 -r1.447 src/share/man/man4/options.4

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



CVS commit: src/sys

2015-08-07 Thread Ryota Ozaki
Module Name:src
Committed By:   ozaki-r
Date:   Fri Aug  7 08:11:33 UTC 2015

Modified Files:
src/sys/net: rtsock.c
src/sys/netinet: if_arp.c ip_input.c ip_output.c
src/sys/netinet6: icmp6.c in6.c in6.h ip6_forward.c ip6_id.c
ip6_mroute.c nd6.c nd6_rtr.c
src/sys/sys: timevar.h

Log Message:
Use time_uptime instead of time_second to avoid time leaps

Some codes in sys/net* use time_second to manage time periods such as
cache expirations. However, time_second doesn't increase monotonically
and can leap by say settimeofday(2) according to time_second(9). We
should use time_uptime instead of it to avoid such time leaps.

This change replaces time_second with time_uptime. Additionally it
converts a time based on time_uptime to a time based on time_second
when the kernel passes the time to userland programs that expect
the latter, and vice versa.

Note that we shouldn't leak time_uptime to other hosts over the
netowrk. My investigation shows there is no such leak:
http://mail-index.netbsd.org/tech-net/2015/08/06/msg005332.html

Discussed on tech-kern and tech-net.


To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 src/sys/net/rtsock.c
cvs rdiff -u -r1.170 -r1.171 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.322 -r1.323 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.244 -r1.245 src/sys/netinet/ip_output.c
cvs rdiff -u -r1.172 -r1.173 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.188 -r1.189 src/sys/netinet6/in6.c
cvs rdiff -u -r1.84 -r1.85 src/sys/netinet6/in6.h
cvs rdiff -u -r1.76 -r1.77 src/sys/netinet6/ip6_forward.c
cvs rdiff -u -r1.17 -r1.18 src/sys/netinet6/ip6_id.c
cvs rdiff -u -r1.107 -r1.108 src/sys/netinet6/ip6_mroute.c
cvs rdiff -u -r1.165 -r1.166 src/sys/netinet6/nd6.c
cvs rdiff -u -r1.101 -r1.102 src/sys/netinet6/nd6_rtr.c
cvs rdiff -u -r1.33 -r1.34 src/sys/sys/timevar.h

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



CVS commit: [netbsd-7] src/distrib/utils/embedded/conf

2015-08-07 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Fri Aug  7 13:44:27 UTC 2015

Modified Files:
src/distrib/utils/embedded/conf [netbsd-7]: armv7.conf

Log Message:
Pull up following revision(s) (requested by skrll in ticket #938):
distrib/utils/embedded/conf/armv7.conf: revision 1.5
Turn resize on


To generate a diff of this commit:
cvs rdiff -u -r1.7.2.2 -r1.7.2.3 src/distrib/utils/embedded/conf/armv7.conf

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



CVS commit: [netbsd-7] src/doc

2015-08-07 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Fri Aug  7 13:45:33 UTC 2015

Modified Files:
src/doc [netbsd-7]: CHANGES-7.0

Log Message:
Ticket #938


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.358 -r1.1.2.359 src/doc/CHANGES-7.0

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



CVS commit: src/sys/arch

2015-08-07 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Fri Aug  7 13:53:28 UTC 2015

Modified Files:
src/sys/arch/acorn26/conf: FOURMEG INSTALL
src/sys/arch/acorn32/conf: NC
src/sys/arch/arc/conf: M403 PICA
src/sys/arch/evbarm/conf: ADI_BRH ARMADILLO210 BCM5301X BCM56340 CP3100
GEMINI GEMINI_MASTER GEMINI_SLAVE GENERIC.common GOLDENGATE
INTEGRATOR_CP IQ31244 IQ80310 IQ80321 LUBBOCK NSLU2 ODROID-U
ODROID-XU TEAMASA_NPWR_FC TISDP2420 TISDP2430 VEXPRESS_A15
src/sys/arch/mmeye/conf: MMTA MMTAICE MMTAROMNEW
src/sys/arch/riscv/conf: GENERIC

Log Message:
Remove KMEMSTATS.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/acorn26/conf/FOURMEG
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/acorn26/conf/INSTALL
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/acorn32/conf/NC
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/arc/conf/M403
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/arc/conf/PICA
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/evbarm/conf/ADI_BRH \
src/sys/arch/evbarm/conf/IQ31244
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/conf/ARMADILLO210
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/conf/BCM5301X
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/BCM56340
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbarm/conf/CP3100
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbarm/conf/GEMINI \
src/sys/arch/evbarm/conf/GEMINI_MASTER \
src/sys/arch/evbarm/conf/GEMINI_SLAVE
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/GENERIC.common
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/conf/GOLDENGATE
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/INTEGRATOR_CP
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/evbarm/conf/IQ80310
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/evbarm/conf/IQ80321
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/evbarm/conf/LUBBOCK
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/conf/NSLU2
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/conf/ODROID-U
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/ODROID-XU
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/conf/TISDP2420 \
src/sys/arch/evbarm/conf/TISDP2430
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/VEXPRESS_A15
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/mmeye/conf/MMTA
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/mmeye/conf/MMTAICE
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/mmeye/conf/MMTAROMNEW
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/conf/GENERIC

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



CVS commit: src/share/man/man9

2015-08-07 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Fri Aug  7 13:56:48 UTC 2015

Modified Files:
src/share/man/man9: malloc.9

Log Message:
Remove KMEMSTATS.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/share/man/man9/malloc.9

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



CVS commit: src/sys/arch

2015-08-07 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Fri Aug  7 14:12:05 UTC 2015

Modified Files:
src/sys/arch/dreamcast/conf: GENERIC
src/sys/arch/evbmips/conf: ALCHEMY AP30 CPMBR1400 DB120 MERAKI RB433UAH
XLSATX ZYXELKX
src/sys/arch/evbppc/conf: EXPLORA451 OPENBLOCKS266 OPENBLOCKS600
src/sys/arch/hpcarm/conf: IPAQ
src/sys/arch/i386/conf: GENERIC_PS2TINY NET4501
src/sys/arch/mvmeppc/conf: GENERIC
src/sys/arch/news68k/conf: GENERIC_TINY
src/sys/arch/sbmips/conf: GENERIC
src/sys/arch/shark/conf: INSTALL
src/sys/arch/sun2/conf: DISKLESS INSTALL RAMDISK

Log Message:
Remove KMEMSTATS.


To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/dreamcast/conf/GENERIC
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/evbmips/conf/ALCHEMY
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbmips/conf/AP30
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbmips/conf/CPMBR1400
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbmips/conf/DB120
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbmips/conf/MERAKI
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbmips/conf/RB433UAH
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbmips/conf/XLSATX
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/conf/ZYXELKX
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/evbppc/conf/EXPLORA451
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/evbppc/conf/OPENBLOCKS266
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbppc/conf/OPENBLOCKS600
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/hpcarm/conf/IPAQ
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/i386/conf/GENERIC_PS2TINY
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/i386/conf/NET4501
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/mvmeppc/conf/GENERIC
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/news68k/conf/GENERIC_TINY
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/sbmips/conf/GENERIC
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/shark/conf/INSTALL
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/sun2/conf/DISKLESS
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/sun2/conf/INSTALL
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/sun2/conf/RAMDISK

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



CVS commit: src/doc

2015-08-07 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Fri Aug  7 15:53:24 UTC 2015

Modified Files:
src/doc: CHANGES CHANGES.prev

Log Message:
Document some of my most important changes

(a bit late...)


To generate a diff of this commit:
cvs rdiff -u -r1.2087 -r1.2088 src/doc/CHANGES
cvs rdiff -u -r1.130 -r1.131 src/doc/CHANGES.prev

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/ipf/netinet

2015-08-07 Thread Patrick Welche
Module Name:src
Committed By:   prlw1
Date:   Fri Aug  7 17:31:12 UTC 2015

Modified Files:
src/sys/external/bsd/ipf/netinet: ip_nat.c ip_nat.h ip_nat6.c

Log Message:
Avoid panic in SIOCGNATL dereferencing a NULL softc.
Solution suggestion from Martin Husemann.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/ipf/netinet/ip_nat.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/ipf/netinet/ip_nat.h
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/ipf/netinet/ip_nat6.c

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



CVS commit: src/sys/arch/mips/ingenic

2015-08-07 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Fri Aug  7 17:37:54 UTC 2015

Modified Files:
src/sys/arch/mips/ingenic: ingenic_regs.h

Log Message:
- sprinkle volatile
- add RNG registers
- fix some comments


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/mips/ingenic/ingenic_regs.h

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



CVS commit: src/sys/arch/mips

2015-08-07 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Fri Aug  7 17:39:58 UTC 2015

Modified Files:
src/sys/arch/mips/conf: files.ingenic
src/sys/arch/mips/ingenic: apbus.c
Added Files:
src/sys/arch/mips/ingenic: ingenic_rng.c

Log Message:
add driver for jz4780 random number generator
>From Michael McConville


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/conf/files.ingenic
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/mips/ingenic/apbus.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/mips/ingenic/ingenic_rng.c

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



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

2015-08-07 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Fri Aug  7 17:41:43 UTC 2015

Modified Files:
src/sys/arch/evbmips/conf: CI20

Log Message:
add jzrng


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbmips/conf/CI20

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



CVS commit: src/sys/kern

2015-08-07 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Sat Aug  8 06:24:40 UTC 2015

Modified Files:
src/sys/kern: exec_elf.c

Log Message:
revert; but still fix the comment


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/kern/exec_elf.c

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



CVS commit: src/sys/arch

2015-08-07 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Sat Aug  8 06:36:26 UTC 2015

Modified Files:
src/sys/arch/alpha/conf: GENERIC
src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0
src/sys/arch/arc/conf: GENERIC
src/sys/arch/bebox/conf: GENERIC
src/sys/arch/cats/conf: GENERIC INSTALL
src/sys/arch/cobalt/conf: GENERIC
src/sys/arch/evbarm/conf: CUBOX-I GUMSTIX HPT5325
src/sys/arch/hp300/conf: GENERIC
src/sys/arch/hpcsh/conf: GENERIC
src/sys/arch/landisk/conf: GENERIC
src/sys/arch/mac68k/conf: GENERIC
src/sys/arch/netwinder/conf: GENERIC
src/sys/arch/news68k/conf: GENERIC
src/sys/arch/next68k/conf: GENERIC
src/sys/arch/rs6000/conf: GENERIC
src/sys/arch/sgimips/conf: GENERIC32_IP12
src/sys/arch/shark/conf: GENERIC
src/sys/arch/vax/conf: GENERIC VAX780
src/sys/arch/x68k/conf: GENERIC

Log Message:
Remove KMEMSTATS.


To generate a diff of this commit:
cvs rdiff -u -r1.364 -r1.365 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.413 -r1.414 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.114 -r1.115 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.184 -r1.185 src/sys/arch/arc/conf/GENERIC
cvs rdiff -u -r1.145 -r1.146 src/sys/arch/bebox/conf/GENERIC
cvs rdiff -u -r1.155 -r1.156 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/cats/conf/INSTALL
cvs rdiff -u -r1.147 -r1.148 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/CUBOX-I
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/evbarm/conf/GUMSTIX
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/conf/HPT5325
cvs rdiff -u -r1.190 -r1.191 src/sys/arch/hp300/conf/GENERIC
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/hpcsh/conf/GENERIC
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/landisk/conf/GENERIC
cvs rdiff -u -r1.220 -r1.221 src/sys/arch/mac68k/conf/GENERIC
cvs rdiff -u -r1.126 -r1.127 src/sys/arch/netwinder/conf/GENERIC
cvs rdiff -u -r1.125 -r1.126 src/sys/arch/news68k/conf/GENERIC
cvs rdiff -u -r1.139 -r1.140 src/sys/arch/next68k/conf/GENERIC
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/rs6000/conf/GENERIC
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sgimips/conf/GENERIC32_IP12
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/shark/conf/GENERIC
cvs rdiff -u -r1.195 -r1.196 src/sys/arch/vax/conf/GENERIC
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/vax/conf/VAX780
cvs rdiff -u -r1.179 -r1.180 src/sys/arch/x68k/conf/GENERIC

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