Date: Wed, 8 Feb 2017 10:42:58 -0500 From: Allan Jude <allanjude@freebsd.org> To: Baptiste Daroussin <bapt@FreeBSD.org>, "Ngie Cooper (yaneurabeya)" <yaneurabeya@gmail.com> 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: <98fba402-dfc3-8977-2f50-8790a8c19637@freebsd.org> In-Reply-To: <20170208125911.sxr2gtayke3qpohr@ivaldir.etoilebsd.net> References: <201701281630.v0SGUEfW063907@repo.freebsd.org> <6F201758-8984-49A9-9F47-5E9C4F5700E4@gmail.com> <20170208125911.sxr2gtayke3qpohr@ivaldir.etoilebsd.net>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --CQTn02gPGV4UL29HCVAOX3MJn8xcdj8WO Content-Type: multipart/mixed; boundary="3D1WjLW2VAk55cuMIeuwDsNtAc7K86eRU"; protected-headers="v1" From: Allan Jude <allanjude@freebsd.org> To: Baptiste Daroussin <bapt@FreeBSD.org>, "Ngie Cooper (yaneurabeya)" <yaneurabeya@gmail.com> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <98fba402-dfc3-8977-2f50-8790a8c19637@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... References: <201701281630.v0SGUEfW063907@repo.freebsd.org> <6F201758-8984-49A9-9F47-5E9C4F5700E4@gmail.com> <20170208125911.sxr2gtayke3qpohr@ivaldir.etoilebsd.net> In-Reply-To: <20170208125911.sxr2gtayke3qpohr@ivaldir.etoilebsd.net> --3D1WjLW2VAk55cuMIeuwDsNtAc7K86eRU Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2017-02-08 07:59, Baptiste Daroussin wrote: > On Wed, Feb 08, 2017 at 12:52:20AM -0800, Ngie Cooper (yaneurabeya) wro= te: >> >>> On Jan 28, 2017, at 08:30, Baptiste Daroussin <bapt@FreeBSD.org> wrot= e: >>> >>> 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 wh= en running =E2=80=9Csvn merge --reintegrate ". Was "svn merge -c -=E2=80=9C= used? >=20 > Yes the crap was I did svn merge -c -312923 then svn ci which took the = revert > and all the temporary crap I had >=20 > I reverted entirely that one later and commit "manually" the files that= were > supposed to be reverted initially by copying the files from before r312= 923 >=20 > So sorry it was a total mess. >=20 > Bapt >=20 Yeah, it looks like bapt@ committed his work-in-progress make OpenSSL in base private patch. --=20 Allan Jude --3D1WjLW2VAk55cuMIeuwDsNtAc7K86eRU-- --CQTn02gPGV4UL29HCVAOX3MJn8xcdj8WO Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (MingW32) iQIcBAEBAgAGBQJYmzyFAAoJEBmVNT4SmAt+5X0P+wd6WvcYW909bK/8/BxJglPZ ThdIXYtRp0sWzCNcJqXKnb9im2/iQxPo6Q/3N1aJ17DOm0i7ZtZTu51qiDYylREH WqUt/Iwd50nNblVmVUxJ7fntZFleybXS7sh7Px8jYts5d5pbTFkPovtccIVkgQpa C3oP6S8J8vg3fv/MR8VTh4lK25KCaAbrYJDGgIm9FmDMYOHoU2oVsmCf967+H/ri W4MQSSLnYye90zl71rTY5dkXPeRbmlATuKlc6cbITwUbU0Bdy2MuAOaReQq9Qvt2 FVwnMulYFth2/glAyZetCif/wGT0BPNcqyBQnN9+zTrPfEYImvqs9UDPzpdtSG7D FmDrLJZF3EYpCw/e4Qqwe8qaOnDriR2dOeCCDBD173OoOFke8ABb+PkjcBT2Lkg4 /1GE0pvWCEw2zUjK+uTQWaYgMgKlNDVehMui7Q6l5qZaLvVCehebcD3yqOKDq/wV jmpuYMnFbLgDg5itSwMc7grd7KbRnrl3aoFyfZYEyUT4YN/XK3pwn353uTiQWwBV SXxDNp9o3Bx+ZWKW+lcItXIroE11Ky+RQGSuYqqMQCOvwer8gODiVJo0Q9Q78qEF Az2SpR7zf3gwPRFVwdY79K3AgPJ5Os6rJoxcZeFwmz4FZnuUJ8VfcZEG4edigPqg eA/YxhrTI79D2Pwcdyao =NbJt -----END PGP SIGNATURE----- --CQTn02gPGV4UL29HCVAOX3MJn8xcdj8WO--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?98fba402-dfc3-8977-2f50-8790a8c19637>