Date: Wed, 8 Feb 2017 00:52:20 -0800 From: "Ngie Cooper (yaneurabeya)" <yaneurabeya@gmail.com> To: Baptiste Daroussin <bapt@FreeBSD.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r312926 - in head: bin/ed contrib/dma share/mk sys/amd64/amd64 sys/amd64/cloudabi64 sys/cam/ctl sys/cddl/dev/fbt/x86 sys/compat/cloudabi sys/compat/cloudabi64 sys/compat/linuxkpi/common... Message-ID: <6F201758-8984-49A9-9F47-5E9C4F5700E4@gmail.com> In-Reply-To: <201701281630.v0SGUEfW063907@repo.freebsd.org> References: <201701281630.v0SGUEfW063907@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_657136FC-AF6C-49AF-8BA4-CAD685E0C908 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Jan 28, 2017, at 08:30, Baptiste Daroussin <bapt@FreeBSD.org> = wrote: >=20 > Author: bapt > Date: Sat Jan 28 16:30:14 2017 > New Revision: 312926 > URL: https://svnweb.freebsd.org/changeset/base/312926 >=20 > Log: > Revert r312923 a better approach will be taken later >=20 > 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 =E2=80=9Csvn merge --reintegrate ". Was "svn merge -c = -=E2=80=9C used? Thanks, -Ngie --Apple-Mail=_657136FC-AF6C-49AF-8BA4-CAD685E0C908 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJYmtxFAAoJEPWDqSZpMIYV+14QAM/YM4XkDD5Nkh2Ch5tBGJ4W /xWa9rc9RzgWxji9axHpQJld4C0tjCuRGGm+EQXbAyb30Oo8jcEd9sBhym0RPOla qXrK50ydDXSl5V3CZ7CyD7T6bAsp5ItrV4+1dgxZh9LiJObjmIcXW1izlNmxCLBc sVcsD12OzbvpyN5Hp1Xoibjhl/cJrcCj1+Om0iZvo0e/SO41GCS8X1lIMc2xSEMD 9FodAzGeJrNof1KCOTEmYBLrAdFC+liySHlt8XI6GRpapGy6hG9FBlf8ul4EowSR To/Sg2no7/EC2noPS+PE8mUoEaCgAbbG/qNowfvCim+3Vyu97G80HXYSSVPIvXif eZAOVFFV/yy7IZg4OI0P79EMGZ5S0KL0eKUIF8r0anu7eIr/+lRQ8ubyPHd940ZW UQwLG/ygYoaBPWz8fdPK9VM7kfgHWg+MKJdzpAEbQY1Pg+Gd4JgpjxnCDCGGy6bL Qwuh5u6p/HGszd1bkB0819uPzkPIExPwNHuiYijhsFiqPDsTiSgqAFLSygUSPTe8 y7KCQVl8BZXalQgi00rATk8tj2+xiFReFnhnGI7+iAetaLMHEBGufskLRCBAZboQ A/x2t+phKH6ugEXicbdtpBT7LbE8Yvaolrgz96K7y+gal6EwH9KRw9a7uBLTfAJL sAs7IsTHyYygm/fn+igX =g8YI -----END PGP SIGNATURE----- --Apple-Mail=_657136FC-AF6C-49AF-8BA4-CAD685E0C908--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6F201758-8984-49A9-9F47-5E9C4F5700E4>