From owner-svn-src-all@freebsd.org Wed Feb 8 12:59:16 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C437ACD6EDA; Wed, 8 Feb 2017 12:59:16 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 66EEB2BF; Wed, 8 Feb 2017 12:59:16 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: by mail-wm0-x243.google.com with SMTP id v77so33012326wmv.0; Wed, 08 Feb 2017 04:59:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=bz1WoOVWLwvZyzNqOA08jkg7r/ElG9ITTwh0dYcUupQ=; b=mN3qOub9puSxSRC0wBQ/yKTZdMS6nLsWbhwAbzxv/amwa8A2X64Yf6nayE8Z7Sak06 xZ/0SfojYtD4715UMgKmq0Lu70D11Gb5S7aDokssOcPwG9d03pLtmzBBJDNiamd2FuuE 7zQYu8Cl/ubVn3XlTmkieYZplUXNudDZYpTMBwNoiWlKRLmQ3ugQrAFP2FyYGCwLDf6h lEO1MM55BSxxIlJTJDv61btICiulyt8+hgbjfId+W3lrOg9kqf2/zgAdjVB6K8GK0ZSB FLLfUGmP1p1gTnNsXDU3BFdoZCxmApNZObozJpZVboQR5iz4ooM68ifAHAAFBmCiZrHQ 7WlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=bz1WoOVWLwvZyzNqOA08jkg7r/ElG9ITTwh0dYcUupQ=; b=V9gUv3P4tftDW4mQ/ATFwBhroUYSyfmF6rZOWq8dKr9lvSILQukzAw8iyeY5EbACcl qQGxq/okLn7ZYkcVpq/qM9CWX1zVijB1+IISbZn4W6tkSjNCD4zZJLO7g2BuIVBcM3oR 4W/ooy1KryOtpe/2QP1fLW8Go9fWoVbEpq6ZcY2B+aCDuy+Gc+WuQimgk2i4lXAAa5ka tYxoYzpwgCyi2r6Q1qLefq0PYE9GfEumZMcXplf85h6r4qz9jSJO/bl6mfw5aFdNDmNq gprOrXl6efczWu2sK/RfgGrElzInB68TDA8jgylpvXUeP0WEa7L1Ny4Ln/GGadDiZyrS OS4A== X-Gm-Message-State: AIkVDXK9p1t1vtWKS2rSLQDnFiULaM7WQPiqxs51tbejEDJEIAR6ZkLewaK3qUHNaMB1bg== X-Received: by 10.223.148.230 with SMTP id 93mr19062090wrr.13.1486558753965; Wed, 08 Feb 2017 04:59:13 -0800 (PST) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by smtp.gmail.com with ESMTPSA id w99sm12952949wrb.5.2017.02.08.04.59.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Feb 2017 04:59:13 -0800 (PST) Sender: Baptiste Daroussin Date: Wed, 8 Feb 2017 13:59:12 +0100 From: Baptiste Daroussin To: "Ngie Cooper (yaneurabeya)" Cc: src-committers , 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: <20170208125911.sxr2gtayke3qpohr@ivaldir.etoilebsd.net> References: <201701281630.v0SGUEfW063907@repo.freebsd.org> <6F201758-8984-49A9-9F47-5E9C4F5700E4@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="bhsrxqnlhlo7s7kz" Content-Disposition: inline In-Reply-To: <6F201758-8984-49A9-9F47-5E9C4F5700E4@gmail.com> User-Agent: NeoMutt/20170128 (1.7.2) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2017 12:59:16 -0000 --bhsrxqnlhlo7s7kz Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Feb 08, 2017 at 12:52:20AM -0800, Ngie Cooper (yaneurabeya) wrote: >=20 > > On Jan 28, 2017, at 08:30, Baptiste Daroussin 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 >=20 > 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 us= ed? Yes the crap was I did svn merge -c -312923 then svn ci which took the reve= rt and all the temporary crap I had I reverted entirely that one later and commit "manually" the files that were supposed to be reverted initially by copying the files from before r312923 So sorry it was a total mess. Bapt --bhsrxqnlhlo7s7kz Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAlibFhwACgkQY4mL3PG3 Plq2CRAAnLcs2m+voJKZNPxzeFVpUhrDwmNJGrQQ957SDIiQNSwr7gR3LB+J7GxZ hpwE7tXwvc3aCOMdrqCnO3EhOGpfoD4erwRLObbp87NnOSGXAgJaMfMu591/em68 0YcaeK/PiPH9y5QZEOKkXIpVVlBQev5/0tm3R6IE3UDkbfaWiAX2pTP0nwoBMUNP hQqEvBwTsEtm7PQlmEATjR0xAxgk37kbBthrxLxxsFYPlzocpNhVuSnKfleH3xkY I8KYt82Nl4yp+ONtKtYGVsoa+mVCa5GN5g46tfqcnXD1xMwqfzJY3KFgFu/zo8wd EVNwqG4t/q9j0KcRMNEZH0EIyjHANHSPE1MyD7Dlow+VFQDt1ly7pinksWjB8DNa k/3HawyrlXD1WkkWa5ayTSEbuEP0aIqct6SHG4qRIFlZM5MJJzCOZRCzSJOfsEzx UPaX8DHIqMLh1tOQyD7DKULwCMZosNXv03X1zn/jBmc+z+Sae88/mtvwB1nkAHNR Rh8QwZ4NTmYPbvLgbITk9EOiNxzQQzB3aOVynrlIQmjWaG6qjF/+szu/o+k+8ogV nWR5xsLlQfBzUPEdsn4PtHUMyCTGhRnbtfkIF9a6VJV0lDgmzg8umIw502HVZ9aE WyAXNlj1+WjCnIaUy0oXNjbqlaaxG+4G/+xfabiW/QUpTLxYHmI= =31x3 -----END PGP SIGNATURE----- --bhsrxqnlhlo7s7kz--