> On Jan 28, 2017, at 08:30, Baptiste Daroussin <b...@freebsd.org> wrote: > > Author: bapt > Date: Sat Jan 28 16:30:14 2017 > New Revision: 312926 > URL: https://svnweb.freebsd.org/changeset/base/312926 > > Log: > Revert r312923 a better approach will be taken later > > Modified: > head/bin/ed/Makefile > head/contrib/dma/mail.c > head/share/mk/bsd.doc.mk > head/sys/amd64/amd64/db_trace.c > head/sys/amd64/cloudabi64/cloudabi64_sysvec.c > head/sys/cam/ctl/ctl_ioctl.h > head/sys/cddl/dev/fbt/x86/fbt_isa.c > head/sys/compat/cloudabi/cloudabi_fd.c > head/sys/compat/cloudabi64/cloudabi64_poll.c > head/sys/compat/linuxkpi/common/include/linux/slab.h > head/sys/contrib/dev/acpica/components/namespace/nsxfeval.c > head/sys/contrib/dev/acpica/include/acpixf.h > head/sys/ddb/ddb.h > head/sys/dev/drm2/drm_agpsupport.c > head/sys/dev/drm2/drm_bufs.c > head/sys/dev/drm2/drm_dma.c > head/sys/dev/drm2/drm_drv.c > head/sys/dev/drm2/drm_os_freebsd.c > head/sys/dev/drm2/drm_os_freebsd.h > head/sys/dev/drm2/drm_stub.c > head/sys/fs/nfsserver/nfs_nfsdstate.c > head/sys/kern/kern_descrip.c > head/sys/kern/kern_shutdown.c > head/sys/modules/drm2/drm2/Makefile > head/tools/build/Makefile > head/tools/tools/locale/etc/unicode.conf > head/usr.bin/getconf/confstr.gperf > head/usr.bin/getconf/getconf.c > head/usr.bin/getconf/limits.gperf > head/usr.bin/getconf/pathconf.gperf > head/usr.bin/getconf/progenv.gperf > head/usr.bin/getconf/sysconf.gperf > head/usr.sbin/nscd/nscd.c > head/usr.sbin/nscd/nscdcli.c
I noticed that this revision and the next one are a point of issue when
running “svn merge --reintegrate ". Was "svn merge -c -“ used?
Thanks,
-Ngie
signature.asc
Description: Message signed with OpenPGP using GPGMail
