From owner-svn-src-head@freebsd.org Wed Feb 8 08:52:24 2017 Return-Path: Delivered-To: svn-src-head@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 345B0CD4D07; Wed, 8 Feb 2017 08:52:24 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf0-x242.google.com (mail-pf0-x242.google.com [IPv6:2607:f8b0:400e:c00::242]) (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 F3D90BCA; Wed, 8 Feb 2017 08:52:23 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pf0-x242.google.com with SMTP id e4so11220425pfg.0; Wed, 08 Feb 2017 00:52:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:mime-version:from:in-reply-to:date:cc:message-id:references :to; bh=Ts+wqcP2wZ1lVljUN8XkLE7whCOAnM9+C00bsShD7Hs=; b=MAfU7lKooTbXzuQbZGDNSqjvxzHCqrs2oj5Xv4Ym61ZdxDp247ivJNHstzl2WLxa3C EdidEmAPNiUe/s4Z5Vp7Xjyvm8LcbTdwLzwcn1XxHVuSzaItK73pPEtaUI3R7rYHBy7/ /5RvjB8F1QBYDHn7jmwao44VAL5U0pVbsWb+DLM/EnLRP77uNVsh1n9x2WvU9T6tvtcQ 6S+CJvR1UPaqCUkb+tMuErUyOFQITLK0gTSZGNvR1dNugIu9uJXE+1HNPRHGSKS7VViR +F3ZPxZpY9jldY6vB6Yu5elxY5Yy1qD4w+Te5KdsDP7kE6OkPbMZM2A99rYDg/NCCxj3 hu7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:mime-version:from:in-reply-to:date:cc :message-id:references:to; bh=Ts+wqcP2wZ1lVljUN8XkLE7whCOAnM9+C00bsShD7Hs=; b=CfzywIU1VoK5jVkNk8uprXQTWIH6W9XB9JCZTvLxd7VuF7iHVATZk/YnjuHcz3A6GL 5l/TnrjOBCBl0zgbpNZuBfk/6zl+xfIEHTeoSc3g416qV5MBhiaxcKLYHqaGe6edOA+Q wkbwe36Sj8qOlw/9DfjLVN81lwbipKQ9gCvseO+XKyYnWN67L7jyav65DSmv7sG7Rdq3 8ox+cYOOU+rWheUXCAw/s7+CJ4auAaLHCNh6Adzn7mFFfqN54MOSgOiRo+qWI1uKPBfu musAKvq8DitmxRnTYEuAca0FVBEm56AuPUL7/Hzxb43M1eFIR8T8rQUMVGCaPyvUfF8e oNvQ== X-Gm-Message-State: AIkVDXLhb6rJCpIimy1NIv0hflbma2cSQjwo2p2XywSoSkTcKF6BLr84TgDuDCvfGbCJhA== X-Received: by 10.98.16.14 with SMTP id y14mr24803277pfi.63.1486543943305; Wed, 08 Feb 2017 00:52:23 -0800 (PST) Received: from pinklady.local (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id m21sm18089339pgh.4.2017.02.08.00.52.22 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Feb 2017 00:52:22 -0800 (PST) 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... Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Content-Type: multipart/signed; boundary="Apple-Mail=_657136FC-AF6C-49AF-8BA4-CAD685E0C908"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail From: "Ngie Cooper (yaneurabeya)" In-Reply-To: <201701281630.v0SGUEfW063907@repo.freebsd.org> Date: Wed, 8 Feb 2017 00:52:20 -0800 Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: <6F201758-8984-49A9-9F47-5E9C4F5700E4@gmail.com> References: <201701281630.v0SGUEfW063907@repo.freebsd.org> To: Baptiste Daroussin X-Mailer: Apple Mail (2.3124) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2017 08:52:24 -0000 --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 = 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--