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...

[Gleb Smirnoff]

  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