From owner-svn-src-all@freebsd.org Mon Sep 21 21:41:02 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 430F23FD919 for ; Mon, 21 Sep 2020 21:41:02 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from cell.glebi.us (glebi.us [162.251.186.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "cell.glebi.us", Issuer "cell.glebi.us" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BwHtk04GKz3gwS; Mon, 21 Sep 2020 21:41:01 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from cell.glebi.us (localhost [127.0.0.1]) by cell.glebi.us (8.16.1/8.16.1) with ESMTPS id 08LLepSL028529 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 21 Sep 2020 14:40:51 -0700 (PDT) (envelope-from glebius@freebsd.org) Received: (from glebius@localhost) by cell.glebi.us (8.16.1/8.16.1/Submit) id 08LLemor028528; Mon, 21 Sep 2020 14:40:48 -0700 (PDT) (envelope-from glebius@freebsd.org) X-Authentication-Warning: cell.glebi.us: glebius set sender to glebius@freebsd.org using -f Date: Mon, 21 Sep 2020 14:40:48 -0700 From: Gleb Smirnoff To: Mateusz Guzik Cc: Andrew Gallatin , Alexey Dokuchaev , Michael Tuexen , Pedro Giffuni , Mateusz Guzik , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph... Message-ID: <20200921214048.GZ1269@FreeBSD.org> References: <202009012119.081LJERb018106@repo.freebsd.org> <95844C00-D10A-456D-AD29-DF572043074F@fh-muenster.de> <20200902020507.GA38274@FreeBSD.org> <20200902180626.GA88595@FreeBSD.org> <6124a908-25a5-e023-16da-7963ba229b7f@FreeBSD.org> <08636D5E-AA07-4AE7-B5AC-656B08CF564B@fh-muenster.de> <20200903024226.GA54078@FreeBSD.org> <60ea593f-8258-e30d-b897-f162168b44d3@cs.duke.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <60ea593f-8258-e30d-b897-f162168b44d3@cs.duke.edu> X-Rspamd-Queue-Id: 4BwHtk04GKz3gwS X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:27348, ipnet:162.251.186.0/24, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 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: Mon, 21 Sep 2020 21:41:02 -0000 Mateusz, On Fri, Sep 04, 2020 at 02:15:04PM -0400, Andrew Gallatin wrote: A> I do the upstream sync between the Netflix tree and A> FreeBSD-current about every 3 weeks (unless glebius beats A> me to the punch and does it first :). I anticipate that A> this blank line sweep will cause lots of conflicts for us. A> I understand this is progress, and I don't object, and I'm A> not asking for a revert, but please understand that cleanups A> like this do have hidden costs. I expect that other commercial A> entities who contribute to FreeBSD will have the same issue, A> and I also anticipate it will cause problems with MFCs sorry for chiming in late, but I'm about to bump at this change. An advice for future sweeps like that. Include the script you used for the sweep into the commit message. Then, mergers, like me, will run same script on their tree before doing a merge and there will be no conflict. Example commit: https://svnweb.freebsd.org/base?view=revision&revision=360579 -- Gleb Smirnoff