CVS commit: src
Module Name:src Committed By: dholland Date: Fri Jul 24 06:59:32 UTC 2015 Modified Files: src/libexec/lfs_cleanerd: cleaner.h coalesce.c lfs_cleanerd.c src/sbin/dump_lfs: lfs_inode.c src/sbin/fsck_lfs: inode.c lfs.c main.c pass1.c pass5.c pass6.c segwrite.c setup.c utilities.c src/sbin/newfs_lfs: make_lfs.c src/sbin/resize_lfs: resize_lfs.c src/sbin/scan_ffs: scan_ffs.c src/sys/ufs/lfs: lfs.h lfs_alloc.c lfs_balloc.c lfs_bio.c lfs_inode.c lfs_pages.c lfs_rfw.c lfs_segment.c lfs_subr.c lfs_syscalls.c lfs_vfsops.c lfs_vnops.c ulfs_inode.h ulfs_quota2.c ulfs_readwrite.c src/usr.sbin/dumplfs: dumplfs.c Log Message: More lfs superblock accessors. (This changes the rest of the code over; all the accessors were already added.) The difference between this commit and the previous one is arbitrary, but the previous one passed the regression tests on its own so I'm keeping it separate to help with any bisections that might be needed in the future. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/libexec/lfs_cleanerd/cleaner.h cvs rdiff -u -r1.25 -r1.26 src/libexec/lfs_cleanerd/coalesce.c cvs rdiff -u -r1.39 -r1.40 src/libexec/lfs_cleanerd/lfs_cleanerd.c cvs rdiff -u -r1.20 -r1.21 src/sbin/dump_lfs/lfs_inode.c cvs rdiff -u -r1.55 -r1.56 src/sbin/fsck_lfs/inode.c cvs rdiff -u -r1.46 -r1.47 src/sbin/fsck_lfs/lfs.c cvs rdiff -u -r1.50 -r1.51 src/sbin/fsck_lfs/main.c cvs rdiff -u -r1.38 -r1.39 src/sbin/fsck_lfs/pass1.c \ src/sbin/fsck_lfs/utilities.c cvs rdiff -u -r1.30 -r1.31 src/sbin/fsck_lfs/pass5.c cvs rdiff -u -r1.35 -r1.36 src/sbin/fsck_lfs/pass6.c cvs rdiff -u -r1.32 -r1.33 src/sbin/fsck_lfs/segwrite.c cvs rdiff -u -r1.47 -r1.48 src/sbin/fsck_lfs/setup.c cvs rdiff -u -r1.32 -r1.33 src/sbin/newfs_lfs/make_lfs.c cvs rdiff -u -r1.10 -r1.11 src/sbin/resize_lfs/resize_lfs.c cvs rdiff -u -r1.26 -r1.27 src/sbin/scan_ffs/scan_ffs.c cvs rdiff -u -r1.164 -r1.165 src/sys/ufs/lfs/lfs.h cvs rdiff -u -r1.122 -r1.123 src/sys/ufs/lfs/lfs_alloc.c cvs rdiff -u -r1.82 -r1.83 src/sys/ufs/lfs/lfs_balloc.c \ src/sys/ufs/lfs/lfs_subr.c cvs rdiff -u -r1.129 -r1.130 src/sys/ufs/lfs/lfs_bio.c cvs rdiff -u -r1.138 -r1.139 src/sys/ufs/lfs/lfs_inode.c cvs rdiff -u -r1.2 -r1.3 src/sys/ufs/lfs/lfs_pages.c cvs rdiff -u -r1.22 -r1.23 src/sys/ufs/lfs/lfs_rfw.c cvs rdiff -u -r1.242 -r1.243 src/sys/ufs/lfs/lfs_segment.c cvs rdiff -u -r1.161 -r1.162 src/sys/ufs/lfs/lfs_syscalls.c cvs rdiff -u -r1.327 -r1.328 src/sys/ufs/lfs/lfs_vfsops.c cvs rdiff -u -r1.274 -r1.275 src/sys/ufs/lfs/lfs_vnops.c cvs rdiff -u -r1.13 -r1.14 src/sys/ufs/lfs/ulfs_inode.h cvs rdiff -u -r1.19 -r1.20 src/sys/ufs/lfs/ulfs_quota2.c cvs rdiff -u -r1.18 -r1.19 src/sys/ufs/lfs/ulfs_readwrite.c cvs rdiff -u -r1.43 -r1.44 src/usr.sbin/dumplfs/dumplfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: dholland Date: Fri Jul 24 06:56:42 UTC 2015 Modified Files: src/libexec/lfs_cleanerd: cleaner.h coalesce.c lfs_cleanerd.c src/sbin/dump_lfs: lfs_inode.c src/sbin/fsck_lfs: dir.c inode.c lfs.c main.c pass0.c pass1.c pass4.c pass5.c pass6.c segwrite.c segwrite.h setup.c utilities.c src/sbin/newfs_lfs: make_lfs.c src/sbin/resize_lfs: resize_lfs.c src/sbin/scan_ffs: scan_ffs.c src/sys/lib/libsa: lfsv1.c lfsv2.c ufs.c src/sys/ufs/lfs: lfs.h lfs_alloc.c lfs_balloc.c lfs_bio.c lfs_inode.c lfs_pages.c lfs_rfw.c lfs_segment.c lfs_subr.c lfs_syscalls.c lfs_vfsops.c lfs_vnops.c ulfs_inode.h ulfs_quota2.c ulfs_readwrite.c src/usr.sbin/dumplfs: dumplfs.c Log Message: Switch to accessor functions for elements of the LFS on-disk superblock. This will allow switching between 32/64 bit forms on the fly; it will also allow handling LFS_EI reasonably tidily. (That currently doesn't work on the superblock.) It also gets rid of cpp abuse in the form of fake structure member macros. Also, instead of doing sleep/wakeup on &lfs_avail and &lfs_nextseg inside the on-disk superblock, add extra elements to the in-memory struct lfs for this. (XXX: these should be changed to condvars, but not right now) XXX: this migrates a structure needed by the lfs code in libsa (struct salfs) into lfs.h, where it doesn't belong, but for the time being this is necessary in order to allow the accessors (and the various lfs macros and other goop that relies on them) to compile. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/libexec/lfs_cleanerd/cleaner.h cvs rdiff -u -r1.24 -r1.25 src/libexec/lfs_cleanerd/coalesce.c cvs rdiff -u -r1.38 -r1.39 src/libexec/lfs_cleanerd/lfs_cleanerd.c cvs rdiff -u -r1.19 -r1.20 src/sbin/dump_lfs/lfs_inode.c cvs rdiff -u -r1.33 -r1.34 src/sbin/fsck_lfs/dir.c cvs rdiff -u -r1.54 -r1.55 src/sbin/fsck_lfs/inode.c cvs rdiff -u -r1.45 -r1.46 src/sbin/fsck_lfs/lfs.c cvs rdiff -u -r1.49 -r1.50 src/sbin/fsck_lfs/main.c cvs rdiff -u -r1.35 -r1.36 src/sbin/fsck_lfs/pass0.c cvs rdiff -u -r1.37 -r1.38 src/sbin/fsck_lfs/pass1.c \ src/sbin/fsck_lfs/utilities.c cvs rdiff -u -r1.23 -r1.24 src/sbin/fsck_lfs/pass4.c cvs rdiff -u -r1.29 -r1.30 src/sbin/fsck_lfs/pass5.c cvs rdiff -u -r1.34 -r1.35 src/sbin/fsck_lfs/pass6.c cvs rdiff -u -r1.31 -r1.32 src/sbin/fsck_lfs/segwrite.c cvs rdiff -u -r1.4 -r1.5 src/sbin/fsck_lfs/segwrite.h cvs rdiff -u -r1.46 -r1.47 src/sbin/fsck_lfs/setup.c cvs rdiff -u -r1.31 -r1.32 src/sbin/newfs_lfs/make_lfs.c cvs rdiff -u -r1.9 -r1.10 src/sbin/resize_lfs/resize_lfs.c cvs rdiff -u -r1.25 -r1.26 src/sbin/scan_ffs/scan_ffs.c cvs rdiff -u -r1.10 -r1.11 src/sys/lib/libsa/lfsv1.c \ src/sys/lib/libsa/lfsv2.c cvs rdiff -u -r1.66 -r1.67 src/sys/lib/libsa/ufs.c cvs rdiff -u -r1.163 -r1.164 src/sys/ufs/lfs/lfs.h cvs rdiff -u -r1.121 -r1.122 src/sys/ufs/lfs/lfs_alloc.c cvs rdiff -u -r1.81 -r1.82 src/sys/ufs/lfs/lfs_balloc.c \ src/sys/ufs/lfs/lfs_subr.c cvs rdiff -u -r1.128 -r1.129 src/sys/ufs/lfs/lfs_bio.c cvs rdiff -u -r1.137 -r1.138 src/sys/ufs/lfs/lfs_inode.c cvs rdiff -u -r1.1 -r1.2 src/sys/ufs/lfs/lfs_pages.c cvs rdiff -u -r1.21 -r1.22 src/sys/ufs/lfs/lfs_rfw.c cvs rdiff -u -r1.241 -r1.242 src/sys/ufs/lfs/lfs_segment.c cvs rdiff -u -r1.160 -r1.161 src/sys/ufs/lfs/lfs_syscalls.c cvs rdiff -u -r1.326 -r1.327 src/sys/ufs/lfs/lfs_vfsops.c cvs rdiff -u -r1.273 -r1.274 src/sys/ufs/lfs/lfs_vnops.c cvs rdiff -u -r1.12 -r1.13 src/sys/ufs/lfs/ulfs_inode.h cvs rdiff -u -r1.18 -r1.19 src/sys/ufs/lfs/ulfs_quota2.c cvs rdiff -u -r1.17 -r1.18 src/sys/ufs/lfs/ulfs_readwrite.c cvs rdiff -u -r1.42 -r1.43 src/usr.sbin/dumplfs/dumplfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/lib/libsa
Module Name:src Committed By: dholland Date: Fri Jul 24 06:53:24 UTC 2015 Modified Files: src/sys/lib/libsa: lfsv1.c lfsv2.c ufs.c Log Message: Rearrange the structures in the lfs bootbollocks slightly. This generates the same output (at least on amd64) but will be more robust until we're ready to deploy lfs64 bootblocks too. XXX: I don't think these actually work right now, and the logic for picking between v1 and v2 lfs formats (which is not related to ffsv1 vs. ffsv2) is definitely broken. But I haven't made it any worse. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/lib/libsa/lfsv1.c src/sys/lib/libsa/lfsv2.c cvs rdiff -u -r1.65 -r1.66 src/sys/lib/libsa/ufs.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/lfs
Module Name:src Committed By: dholland Date: Fri Jul 24 06:51:46 UTC 2015 Modified Files: src/sys/ufs/lfs: lfs.h Log Message: ulfs2_dinode, having never actually been used with lfs, doesn't have a di_inumber field. Fix that. First preliminary step on PR 5. To generate a diff of this commit: cvs rdiff -u -r1.162 -r1.163 src/sys/ufs/lfs/lfs.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/x86/pci
Module Name:src Committed By: knakahara Date: Fri Jul 24 06:49:58 UTC 2015 Modified Files: src/sys/arch/x86/pci: pci_intr_machdep.c Log Message: fix pci_intr_alloc(..., NULL, 0). reported nonaka@n.o To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/x86/pci/pci_intr_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: martin Date: Fri Jul 24 06:17:10 UTC 2015 Modified Files: src/sys/dev/pci: oboe.c Log Message: Pass the device, not the struct softc to config_found(). Avoids a crash at attach time, PR port-i386/50076. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pci/oboe.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/arm/cortex
Module Name:src Committed By: ryo Date: Fri Jul 24 05:20:01 UTC 2015 Modified Files: src/sys/arch/arm/cortex: a9tmr.c Log Message: KNF To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/cortex/a9tmr.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/arm/cortex
Module Name:src Committed By: ryo Date: Fri Jul 24 05:19:14 UTC 2015 Modified Files: src/sys/arch/arm/cortex: a9tmr.c Log Message: - fix sc_ev_missing_ticks over-counting. - don't use 64bit division, because it has expensive cost on gcc/arm whether it is a constant or not. 'delta' is usually taken a value around sc_autoinc depending on timing of read. therefore 'delta / sc->sc_autoinc' would be count too much. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/cortex/a9tmr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src Committed By: matt Date: Fri Jul 24 04:33:50 UTC 2015 Modified Files: src/sys/netinet: tcp_output.c Log Message: If we are sending a window probe and there's unacked data in the socket, make sure at least the persist timer is running. To generate a diff of this commit: cvs rdiff -u -r1.183 -r1.184 src/sys/netinet/tcp_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/netinet
Module Name:src Committed By: matt Date: Fri Jul 24 04:31:21 UTC 2015 Modified Files: src/sys/netinet: tcp_input.c Log Message: Make sure that snd_win doesn't go negative. To generate a diff of this commit: cvs rdiff -u -r1.342 -r1.343 src/sys/netinet/tcp_input.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/xserver
Module Name:src Committed By: mrg Date: Fri Jul 24 04:29:28 UTC 2015 Modified Files: src/distrib/sets/lists/xserver: md.amd64 Log Message: libdri2.a is still installed. To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/distrib/sets/lists/xserver/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: jmcneill Date: Thu Jul 23 23:53:14 UTC 2015 Modified Files: src/sys/arch/arm/nvidia: tegra_sdhc.c Log Message: use SDHC_FLAG_NO_TIMEOUT To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/nvidia/tegra_sdhc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/sdmmc
Module Name:src Committed By: jmcneill Date: Thu Jul 23 23:52:54 UTC 2015 Modified Files: src/sys/dev/sdmmc: sdhc.c sdhcvar.h Log Message: Add a SDHC_FLAG_NO_TIMEOUT quirk to handle spurious timeouts on Tegra K1 during data transfers. While here, increase the soft timeout for DMA transfers from 1s to 3s. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/dev/sdmmc/sdhc.c cvs rdiff -u -r1.18 -r1.19 src/sys/dev/sdmmc/sdhcvar.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
Module Name:src Committed By: snj Date: Thu Jul 23 18:45:16 UTC 2015 Modified Files: src/distrib/notes/common [netbsd-7]: main src/doc [netbsd-7]: CHANGES-7.0 src/sys/sys [netbsd-7]: param.h Log Message: Welcome to 7.0_RC2! To generate a diff of this commit: cvs rdiff -u -r1.510.4.4 -r1.510.4.5 src/distrib/notes/common/main cvs rdiff -u -r1.1.2.346 -r1.1.2.347 src/doc/CHANGES-7.0 cvs rdiff -u -r1.459.2.3 -r1.459.2.4 src/sys/sys/param.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/arm/nvidia
Module Name:src Committed By: jmcneill Date: Thu Jul 23 18:22:05 UTC 2015 Modified Files: src/sys/arch/arm/nvidia: tegra_car.c tegra_sdhc.c tegra_var.h Log Message: Support fractional dividers. This lets us use 48MHz for SDMMC HS mode instead of 45.333MHz. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/nvidia/tegra_car.c \ src/sys/arch/arm/nvidia/tegra_var.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/nvidia/tegra_sdhc.c 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
Module Name:src Committed By: snj Date: Thu Jul 23 17:46:40 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 885 To generate a diff of this commit: cvs rdiff -u -r1.1.2.345 -r1.1.2.346 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: [netbsd-7] xsrc/external/mit/libX11/dist/src/xkb
Module Name:xsrc Committed By: snj Date: Thu Jul 23 17:43:41 UTC 2015 Modified Files: xsrc/external/mit/libX11/dist/src/xkb [netbsd-7]: XKBMAlloc.c Log Message: Apply patch (requested by mrg in ticket #885): Bring in the upstream fix (1e362fac92c6688fb42b195ccad16d7a337a34c1) that was attempted locally in revision 1.2: Ensure we allocate at least XkbNumRequiredTypes in map. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.2.1 \ xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/rc.d
Module Name:src Committed By: riz Date: Thu Jul 23 17:12:16 UTC 2015 Modified Files: src/etc/rc.d: postfix Log Message: Implement "status" command for postfix - makes tools like ansible happier. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/etc/rc.d/postfix Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: jmcneill Date: Thu Jul 23 15:43:06 UTC 2015 Modified Files: src/sys/arch/arm/nvidia: tegra_hdmi.c Log Message: no need for exact match on tmds mode, just use the closest match To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/nvidia/tegra_hdmi.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/arm/nvidia
Module Name:src Committed By: skrll Date: Thu Jul 23 15:08:19 UTC 2015 Modified Files: src/sys/arch/arm/nvidia: tegra_dcreg.h tegra_hdmireg.h Log Message: More defines To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nvidia/tegra_dcreg.h \ src/sys/arch/arm/nvidia/tegra_hdmireg.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/arm/nvidia
Module Name:src Committed By: skrll Date: Thu Jul 23 15:07:31 UTC 2015 Modified Files: src/sys/arch/arm/nvidia: tegra_carreg.h Log Message: CAR_PLLD_BASE_REG defines To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/nvidia/tegra_carreg.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/arm/nvidia
Module Name:src Committed By: jmcneill Date: Thu Jul 23 14:31:05 UTC 2015 Modified Files: src/sys/arch/arm/nvidia: tegra_dc.c tegra_dcreg.h tegra_genfb.c tegra_hdmi.c tegra_hdmireg.h Log Message: add Tegra124 HDMI support To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nvidia/tegra_dc.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nvidia/tegra_dcreg.h \ src/sys/arch/arm/nvidia/tegra_genfb.c \ src/sys/arch/arm/nvidia/tegra_hdmireg.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nvidia/tegra_hdmi.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/arm/nvidia
Module Name:src Committed By: jmcneill Date: Thu Jul 23 14:30:07 UTC 2015 Modified Files: src/sys/arch/arm/nvidia: tegra_car.c Log Message: fix some clocks; many periph dividers are in units of 0.5x not 1x, use PLLD2 for DC, use correct pldiv value for PLLD2 To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/nvidia/tegra_car.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net/if_bridge
Module Name:src Committed By: ozaki-r Date: Thu Jul 23 11:05:34 UTC 2015 Modified Files: src/tests/net/if_bridge: t_bridge.sh Log Message: Reflect a fix for bridge Due to PR 48104, some tests of ping/ping6 were failed but the tests now should be successful. So reverse atf_check. Bonus: the fix for PR 48104 also fixes another uknown failure. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/tests/net/if_bridge/t_bridge.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src Committed By: ozaki-r Date: Thu Jul 23 10:52:34 UTC 2015 Modified Files: src/sys/net: if_bridge.c Log Message: Fix PR 48104 So far bridge cannot receive frames via a member interface when the frames come from another member interface. So when we assign an IP address to a member interface, hosts connected to another member interface cannot ping to the IP address. That behavior isn't expected. See PR 48104 for more realistic examples of this issue. The change does: - drop M_PROMISC before ether_input, which allows a bridge member interface to receive a frame coming from another bridge member interface - receive broadcast/multicast frames via all bridge member interfaces, which is required to receive IPv6 multicast packets destined to a multicast group belonging to a bridge member interface that is different from a packet arrival interface roy@ helped testing of the fix, thanks! To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/sys/net/if_bridge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/union
Module Name:src Committed By: hannken Date: Thu Jul 23 09:45:21 UTC 2015 Modified Files: src/sys/fs/union: union_vfsops.c Log Message: union_unmount: use vfs_vnode_iterator to count attached vnodes. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/sys/fs/union/union_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src Committed By: mrg Date: Thu Jul 23 09:38:00 UTC 2015 Modified Files: src/external/mit/xorg/bin/xterm: Makefile Log Message: remove some duplication; pointed out by pgoyette. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/bin/xterm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Thu Jul 23 08:24:07 UTC 2015 Modified Files: src/sys/dev/pci: if_wm.c Log Message: The WM_F_EEPROM_EERDEEWR is not required on iNVM device. To generate a diff of this commit: cvs rdiff -u -r1.342 -r1.343 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Thu Jul 23 08:29:58 UTC 2015 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Fix a bug that I21[01] NVM revision >= 3.25 can't be attached. Reported by MATSUI Yoshihiro. To generate a diff of this commit: cvs rdiff -u -r1.343 -r1.344 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: mrg Date: Thu Jul 23 08:04:05 UTC 2015 Modified Files: src: BUILDING Makefile src/compat: compatsubdir.mk src/crypto/external/bsd/openssh: Makefile.inc src/distrib/sets: mkvars.mk sets.subr src/doc: BUILDING.mdoc HACKS src/etc: Makefile Makefile.params src/etc/mtree: Makefile src/external/mit: Makefile src/external/mit/xorg/bin/xedit/lisp: Makefile src/external/mit/xorg/lib/libX11: Makefile.libx11 src/external/mit/xorg/lib/libXrender: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile src/external/mit/xorg/server/xorg-server/os: Makefile src/external/mit/xorg/tools/mkfontscale: Makefile src/share/man/man5: mk.conf.5 src/share/mk: bsd.README bsd.own.mk bsd.x11.mk src/tools: Makefile Removed Files: src/etc/mtree: NetBSD.dist.XFree86 src/x11: Makefile TODO src/x11/Xserver: Makefile Makefile.common Makefile.serverlib src/x11/Xserver/GL: Makefile src/x11/Xserver/GL/GLcore: Makefile Makefile.GLcore src/x11/Xserver/GL/GLcore/module: Makefile src/x11/Xserver/GL/dri: Makefile src/x11/Xserver/GL/dri/mga_dri: Makefile shlib_version src/x11/Xserver/GL/dri/radeon_dri: Makefile shlib_version src/x11/Xserver/GL/glx: Makefile Makefile.glx src/x11/Xserver/GL/glx/module: Makefile src/x11/Xserver/Xext: Makefile Makefile.ext src/x11/Xserver/Xext/ext: Makefile src/x11/Xserver/Xext/extmod: Makefile src/x11/Xserver/Xext/exts: Makefile src/x11/Xserver/Xfont: Makefile src/x11/Xserver/Xfont/bitmap: Makefile src/x11/Xserver/Xfont/freetype: Makefile src/x11/Xserver/Xfont/speedo: Makefile src/x11/Xserver/Xfont/type1: Makefile src/x11/Xserver/Xfont/xtt: Makefile src/x11/Xserver/Xserver: Makefile Makefile.Xserver src/x11/Xserver/Xserver/X68k: Makefile X68k.c src/x11/Xserver/Xserver/XF68_FBDev: XF68_FBDev.c src/x11/Xserver/Xserver/XF68_SVGA: XF68_SVGA.c src/x11/Xserver/Xserver/XF68_W32: XF68_W32.c src/x11/Xserver/Xserver/XFree86: Makefile XFree86.c src/x11/Xserver/Xserver/XalphaNetBSD: Makefile XalphaNetBSD.c src/x11/Xserver/Xserver/Xamiga: Makefile Xamiga.c src/x11/Xserver/Xserver/Xarm32VIDC: Makefile Xarm32VIDC.c src/x11/Xserver/Xserver/XdecNetBSD: Makefile XdecNetBSD.c src/x11/Xserver/Xserver/Xdmx: Makefile Xdmx.c src/x11/Xserver/Xserver/Xdreamcast: Makefile Xdreamcast.c src/x11/Xserver/Xserver/Xews4800mips: Makefile Xews4800mips.c src/x11/Xserver/Xserver/Xhpc: Makefile Xhpc.c src/x11/Xserver/Xserver/Xmac68k: Makefile Xmac68k.c src/x11/Xserver/Xserver/Xmacppc: Makefile Xmacppc.c src/x11/Xserver/Xserver/Xnest: Makefile Xnest.c src/x11/Xserver/Xserver/Xnewsmips: Makefile Xnewsmips.c src/x11/Xserver/Xserver/Xprt: Makefile Xprt.c src/x11/Xserver/Xserver/Xsun: Makefile Xsun.c src/x11/Xserver/Xserver/Xsun24: Makefile Xsun24.c src/x11/Xserver/Xserver/XsunMono: Makefile XsunMono.c src/x11/Xserver/Xserver/Xvfb: Makefile Xvfb.c src/x11/Xserver/afb: Makefile Makefile.afb src/x11/Xserver/afb/afb: Makefile src/x11/Xserver/afb/afbmod: Makefile src/x11/Xserver/cfb: Makefile Makefile.cfb src/x11/Xserver/cfb/module: Makefile src/x11/Xserver/cfb16: Makefile src/x11/Xserver/cfb16/module: Makefile src/x11/Xserver/cfb24: Makefile src/x11/Xserver/cfb24/module: Makefile src/x11/Xserver/cfb32: Makefile src/x11/Xserver/cfb32/module: Makefile src/x11/Xserver/dbe: Makefile Makefile.dbe src/x11/Xserver/dbe/module: Makefile src/x11/Xserver/dix: Makefile src/x11/Xserver/dix/xpstubs: Makefile src/x11/Xserver/fb: Makefile Makefile.fb src/x11/Xserver/fb/module: Makefile src/x11/Xserver/fontbase: Makefile src/x11/Xserver/hw: Makefile src/x11/Xserver/hw/dmx: Makefile src/x11/Xserver/hw/dmx/bin: Makefile src/x11/Xserver/hw/dmx/bin/dmxaddinput: Makefile src/x11/Xserver/hw/dmx/bin/dmxaddscreen: Makefile src/x11/Xserver/hw/dmx/bin/dmxreconfig: Makefile src/x11/Xserver/hw/dmx/bin/dmxresize: Makefile src/x11/Xserver/hw/dmx/bin/dmxrminput: Makefile src/x11/Xserver/hw/dmx/bin/dmxrmscreen: Makefile src/x11/Xserver/hw/dmx/bin/dmxtodmx: Makefile src/x11/Xserver/hw/dmx/bin/dmxwininfo: Makefile src/x11/Xserver/hw/dmx/bin/evi: Makefile src/x11/Xserver/hw/dmx/bin/res: Makefile src/x11/Xserver/hw/dmx/bin/vdltodmx: Makefile src/x11/Xserver/hw/dmx/bin/xbell: Makefile src/x11/Xserver/hw/dmx/bin/x
CVS commit: src/etc/mtree
Module Name:src Committed By: mrg Date: Thu Jul 23 07:45:44 UTC 2015 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: remove obsolete directories (that are always removed by postinstall at the end of the build.) To generate a diff of this commit: cvs rdiff -u -r1.145 -r1.146 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Thu Jul 23 07:44:46 UTC 2015 Modified Files: src/share/mk: bsd.own.mk Log Message: add rstart and showfont. To generate a diff of this commit: cvs rdiff -u -r1.860 -r1.861 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Thu Jul 23 07:36:33 UTC 2015 Modified Files: src/sys/dev/usb [nick-nhusb]: ucom.c Log Message: Convert to usbhist To generate a diff of this commit: cvs rdiff -u -r1.108.2.6 -r1.108.2.7 src/sys/dev/usb/ucom.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools
Module Name:src Committed By: mrg Date: Thu Jul 23 07:36:55 UTC 2015 Modified Files: src/external/mit/xorg/tools: Makefile Removed Files: src/external/mit/xorg/tools/gen_matypes: Makefile Makefile.gen_matypes Log Message: remove obsolete tools and comments. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/tools/Makefile cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/tools/gen_matypes/Makefile \ src/external/mit/xorg/tools/gen_matypes/Makefile.gen_matypes Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/bin
Module Name:src Committed By: mrg Date: Thu Jul 23 07:34:38 UTC 2015 Added Files: src/external/mit/xorg/bin/rstart: Makefile Makefile.rstart src/external/mit/xorg/bin/rstart/commands: Makefile src/external/mit/xorg/bin/rstart/commands/x11r6: Makefile src/external/mit/xorg/bin/rstart/contexts: Makefile src/external/mit/xorg/bin/showfont: Makefile Log Message: copy reachovers and mostly update for modern xorg. showfont builds but rstart doesn't quite yet... To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/rstart/Makefile \ src/external/mit/xorg/bin/rstart/Makefile.rstart cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/rstart/commands/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/bin/rstart/commands/x11r6/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/rstart/contexts/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/showfont/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/bin/missing-apps
Module Name:src Committed By: mrg Date: Thu Jul 23 07:33:34 UTC 2015 Removed Files: src/external/mit/xorg/bin/missing-apps/dpsexec: Makefile src/external/mit/xorg/bin/missing-apps/dpsinfo: Makefile src/external/mit/xorg/bin/missing-apps/gccmakedep: Makefile src/external/mit/xorg/bin/missing-apps/lndir: Makefile src/external/mit/xorg/bin/missing-apps/makepsres: Makefile src/external/mit/xorg/bin/missing-apps/mkcfm: Makefile src/external/mit/xorg/bin/missing-apps/pswrap: Makefile src/external/mit/xorg/bin/missing-apps/rman: Makefile src/external/mit/xorg/bin/missing-apps/rstart: Makefile Makefile.rstart src/external/mit/xorg/bin/missing-apps/rstart/commands: Makefile src/external/mit/xorg/bin/missing-apps/rstart/commands/x11r6: Makefile src/external/mit/xorg/bin/missing-apps/rstart/contexts: Makefile src/external/mit/xorg/bin/missing-apps/scripts: Makefile src/external/mit/xorg/bin/missing-apps/showfont: Makefile src/external/mit/xorg/bin/missing-apps/texteroids: Makefile Log Message: delete obsolete reachovers. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/dpsexec/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/dpsinfo/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/gccmakedep/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/lndir/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/makepsres/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/mkcfm/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/pswrap/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/rman/Makefile cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/bin/missing-apps/rstart/Makefile \ src/external/mit/xorg/bin/missing-apps/rstart/Makefile.rstart cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/rstart/commands/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/rstart/commands/x11r6/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/rstart/contexts/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/scripts/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/showfont/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/texteroids/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/mkcfm/dist
Module Name:xsrc Committed By: mrg Date: Thu Jul 23 07:22:32 UTC 2015 Removed Files: xsrc/external/mit/mkcfm/dist: AUTHORS COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS README aclocal.m4 compile config.guess config.h.in config.sub configure configure.ac depcomp install-sh missing mkcfm.c mkcfm.man mkinstalldirs Log Message: oops, didn't meant to import this. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/mkcfm/dist/AUTHORS \ xsrc/external/mit/mkcfm/dist/COPYING \ xsrc/external/mit/mkcfm/dist/ChangeLog \ xsrc/external/mit/mkcfm/dist/INSTALL \ xsrc/external/mit/mkcfm/dist/Makefile.am \ xsrc/external/mit/mkcfm/dist/Makefile.in \ xsrc/external/mit/mkcfm/dist/NEWS xsrc/external/mit/mkcfm/dist/README \ xsrc/external/mit/mkcfm/dist/aclocal.m4 \ xsrc/external/mit/mkcfm/dist/compile \ xsrc/external/mit/mkcfm/dist/config.guess \ xsrc/external/mit/mkcfm/dist/config.h.in \ xsrc/external/mit/mkcfm/dist/config.sub \ xsrc/external/mit/mkcfm/dist/configure \ xsrc/external/mit/mkcfm/dist/configure.ac \ xsrc/external/mit/mkcfm/dist/depcomp \ xsrc/external/mit/mkcfm/dist/install-sh \ xsrc/external/mit/mkcfm/dist/missing xsrc/external/mit/mkcfm/dist/mkcfm.c \ xsrc/external/mit/mkcfm/dist/mkcfm.man \ xsrc/external/mit/mkcfm/dist/mkinstalldirs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: xsrc/external/mit/rstart/dist
Module Name:xsrc Committed By: mrg Date: Thu Jul 23 07:10:06 UTC 2015 Update of /cvsroot/xsrc/external/mit/rstart/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1174 Log Message: initial import of rstart-1.0.5 Status: Vendor Tag: xorg Release Tags: rstart-1-0-5 N xsrc/external/mit/rstart/dist/server.os2 N xsrc/external/mit/rstart/dist/INSTALL N xsrc/external/mit/rstart/dist/config.h.in N xsrc/external/mit/rstart/dist/ChangeLog N xsrc/external/mit/rstart/dist/configure.ac N xsrc/external/mit/rstart/dist/server.c N xsrc/external/mit/rstart/dist/config.sub N xsrc/external/mit/rstart/dist/auth.c N xsrc/external/mit/rstart/dist/Makefile.in N xsrc/external/mit/rstart/dist/config.guess N xsrc/external/mit/rstart/dist/COPYING N xsrc/external/mit/rstart/dist/server.h N xsrc/external/mit/rstart/dist/Makefile.am N xsrc/external/mit/rstart/dist/aclocal.m4 N xsrc/external/mit/rstart/dist/missing N xsrc/external/mit/rstart/dist/install-sh N xsrc/external/mit/rstart/dist/depcomp N xsrc/external/mit/rstart/dist/configure N xsrc/external/mit/rstart/dist/README N xsrc/external/mit/rstart/dist/scripts/rstartd.in N xsrc/external/mit/rstart/dist/scripts/Makefile.am N xsrc/external/mit/rstart/dist/scripts/config.in N xsrc/external/mit/rstart/dist/scripts/Makefile.in N xsrc/external/mit/rstart/dist/scripts/rstart.in N xsrc/external/mit/rstart/dist/specs/Makefile.in N xsrc/external/mit/rstart/dist/specs/rstart.ms N xsrc/external/mit/rstart/dist/specs/fix.awk N xsrc/external/mit/rstart/dist/specs/tmac.rfc N xsrc/external/mit/rstart/dist/specs/Makefile.am N xsrc/external/mit/rstart/dist/specs/fix.nawk N xsrc/external/mit/rstart/dist/specs/rstartd.txt N xsrc/external/mit/rstart/dist/specs/fix.sed N xsrc/external/mit/rstart/dist/samples/Makefile.in N xsrc/external/mit/rstart/dist/samples/Makefile.am N xsrc/external/mit/rstart/dist/samples/contexts.odt1/openwindows2 N xsrc/external/mit/rstart/dist/samples/contexts.odt1/@List N xsrc/external/mit/rstart/dist/samples/contexts.odt1/openwindows3 N xsrc/external/mit/rstart/dist/samples/contexts.odt1/x11r5 N xsrc/external/mit/rstart/dist/samples/contexts.odt1/odt1 N xsrc/external/mit/rstart/dist/samples/contexts.odt1/default N xsrc/external/mit/rstart/dist/samples/contexts.odt1/@Aliases N xsrc/external/mit/rstart/dist/samples/contexts.odt1/x11r6 N xsrc/external/mit/rstart/dist/samples/commands/ListGenericCommands N xsrc/external/mit/rstart/dist/samples/commands/ListContexts N xsrc/external/mit/rstart/dist/samples/commands/@List N xsrc/external/mit/rstart/dist/samples/commands/odt1/LoadMonitor N xsrc/external/mit/rstart/dist/samples/commands/odt1/@List N xsrc/external/mit/rstart/dist/samples/commands/odt1/Terminal N xsrc/external/mit/rstart/dist/samples/commands/x11r5/LoadMonitor N xsrc/external/mit/rstart/dist/samples/commands/x11r5/@List N xsrc/external/mit/rstart/dist/samples/commands/x11r5/Terminal N xsrc/external/mit/rstart/dist/samples/commands/openwindows3/LoadMonitor N xsrc/external/mit/rstart/dist/samples/commands/openwindows3/Terminal N xsrc/external/mit/rstart/dist/samples/commands/openwindows3/@List N xsrc/external/mit/rstart/dist/samples/commands/openwindows2/LoadMonitor N xsrc/external/mit/rstart/dist/samples/commands/openwindows2/@List N xsrc/external/mit/rstart/dist/samples/commands/openwindows2/Terminal N xsrc/external/mit/rstart/dist/commands/ListContexts N xsrc/external/mit/rstart/dist/commands/@List N xsrc/external/mit/rstart/dist/commands/ListGenericCommands N xsrc/external/mit/rstart/dist/commands/Makefile.in N xsrc/external/mit/rstart/dist/commands/Makefile.am N xsrc/external/mit/rstart/dist/commands/x11r6/LoadMonitor N xsrc/external/mit/rstart/dist/commands/x11r6/Terminal N xsrc/external/mit/rstart/dist/commands/x11r6/@List N xsrc/external/mit/rstart/dist/contexts/Makefile.am N xsrc/external/mit/rstart/dist/contexts/default N xsrc/external/mit/rstart/dist/contexts/Makefile.in N xsrc/external/mit/rstart/dist/contexts/x11r6.in N xsrc/external/mit/rstart/dist/contexts/@Aliases N xsrc/external/mit/rstart/dist/contexts/@List N xsrc/external/mit/rstart/dist/man/rstartd.man N xsrc/external/mit/rstart/dist/man/Makefile.am N xsrc/external/mit/rstart/dist/man/rstart.man N xsrc/external/mit/rstart/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/showfont/dist
Module Name:xsrc Committed By: mrg Date: Thu Jul 23 07:10:07 UTC 2015 Update of /cvsroot/xsrc/external/mit/showfont/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21823 Log Message: initial import of showfont-1.0.5 Status: Vendor Tag: xorg Release Tags: showfont-1-0-5 N xsrc/external/mit/showfont/dist/README N xsrc/external/mit/showfont/dist/config.h.in N xsrc/external/mit/showfont/dist/INSTALL N xsrc/external/mit/showfont/dist/config.guess N xsrc/external/mit/showfont/dist/config.sub N xsrc/external/mit/showfont/dist/COPYING N xsrc/external/mit/showfont/dist/configure N xsrc/external/mit/showfont/dist/Makefile.in N xsrc/external/mit/showfont/dist/compile N xsrc/external/mit/showfont/dist/ChangeLog N xsrc/external/mit/showfont/dist/aclocal.m4 N xsrc/external/mit/showfont/dist/configure.ac N xsrc/external/mit/showfont/dist/showfont.c N xsrc/external/mit/showfont/dist/install-sh N xsrc/external/mit/showfont/dist/depcomp N xsrc/external/mit/showfont/dist/missing N xsrc/external/mit/showfont/dist/Makefile.am N xsrc/external/mit/showfont/dist/man/Makefile.am N xsrc/external/mit/showfont/dist/man/Makefile.in N xsrc/external/mit/showfont/dist/man/showfont.man No conflicts created by this import
CVS import: xsrc/external/mit/mkcfm/dist
Module Name:xsrc Committed By: mrg Date: Thu Jul 23 07:10:04 UTC 2015 Update of /cvsroot/xsrc/external/mit/mkcfm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25746 Log Message: initial import of mkcfm-1.0.1 Status: Vendor Tag: xorg Release Tags: mkcfm-1-0-1 N xsrc/external/mit/mkcfm/dist/mkinstalldirs N xsrc/external/mit/mkcfm/dist/config.guess N xsrc/external/mit/mkcfm/dist/missing N xsrc/external/mit/mkcfm/dist/NEWS N xsrc/external/mit/mkcfm/dist/config.h.in N xsrc/external/mit/mkcfm/dist/README N xsrc/external/mit/mkcfm/dist/mkcfm.c N xsrc/external/mit/mkcfm/dist/COPYING N xsrc/external/mit/mkcfm/dist/Makefile.am N xsrc/external/mit/mkcfm/dist/AUTHORS N xsrc/external/mit/mkcfm/dist/compile N xsrc/external/mit/mkcfm/dist/depcomp N xsrc/external/mit/mkcfm/dist/config.sub N xsrc/external/mit/mkcfm/dist/ChangeLog N xsrc/external/mit/mkcfm/dist/install-sh N xsrc/external/mit/mkcfm/dist/INSTALL N xsrc/external/mit/mkcfm/dist/configure N xsrc/external/mit/mkcfm/dist/aclocal.m4 N xsrc/external/mit/mkcfm/dist/mkcfm.man N xsrc/external/mit/mkcfm/dist/Makefile.in N xsrc/external/mit/mkcfm/dist/configure.ac No conflicts created by this import
