From owner-dev-commits-src-branches@freebsd.org Fri Jan 22 21:08:45 2021 Return-Path: Delivered-To: dev-commits-src-branches@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 42EAA4FE723 for ; Fri, 22 Jan 2021 21:08:45 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf2f.google.com (mail-qv1-xf2f.google.com [IPv6:2607:f8b0:4864:20::f2f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DMsLj1CPwz4R7g for ; Fri, 22 Jan 2021 21:08:44 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf2f.google.com with SMTP id et9so3344402qvb.10 for ; Fri, 22 Jan 2021 13:08:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=3xhTZaMclxiRHUG0IjXVqpBEuhPMlUdn+sFpRXLJE/4=; b=yF/qGJk+7qQkv2CmR8DjN4wnYLFGmVCe/QBUt7u1YZtPJs6SKRoOobBN2EmfbANwBi qlJhMErQShhQhRkXAZFn/2oUk4EOFb5L0/AkHpNufqf/vArVEFADLUASGRSEA0gW+/8p Zln9ZzZgodXDiUF9Nk2ao8bqk3etypYQAtdB0uZhbIz4fVTAsVS1uCh+c2dqfK6QnruD M6yxBb4/Z72frZghCOYDKOByLH9gEa+aRWSZowBk1JdYT8ew/4zQ2GK+O9hIlwFS2YF4 6ZxFKvMZrcdIhym8+mpOF5VNjh2tTexcglAUP5LOYJ92zRO+QFRYeCo4Y1umCJkw00o7 0DVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=3xhTZaMclxiRHUG0IjXVqpBEuhPMlUdn+sFpRXLJE/4=; b=rG1TVCwgKY1rKWSe7QWoVukbA+OKoOvJSS4Tv7y2KR9M6JKlcoPHiAQcJmn/B1us8S vEmJmW+6yaOxbwGB3HwfNwRE7NScaLpgpEjcWMNWtUyjuT17/d/Aynbx03TTS5f+0sYZ YfG9rQQgRngOnLJjuWzaXF5PacVYNlgui9gY7iZ6vsSj4y2TiYHuyueqb+e2MmwaXrJT rWLNtEqbYHEjGmRNCmaIEt3cM7zP8wEgP9Xx1crqhRapgzR+/j4Qn3pM46MfkkTOTYPt 2oB95lKAyGuy2f+WQoeheU3z3bNXDdAl/c3/dhQaD25Y5cP7HbKB9TZxewJ8nmtkjo4p LM/Q== X-Gm-Message-State: AOAM533wYWJNTlHm7844h6ap9cDNx6GzV6zP1haS6kg7iltyCRIf1PWt 9NldlDMUZxDnwfn+twJyUIUXZAHc4xl9PUZfhCEKTw== X-Google-Smtp-Source: ABdhPJw7AUlMquSst400b9p2dq/Sle2rizcZ/oxYP8BK1Uwqczlpjra7stGThiwgxGOxBy4gNNr/pTrd4WhHJ90Yiio= X-Received: by 2002:ad4:4c01:: with SMTP id bz1mr6291686qvb.62.1611349723861; Fri, 22 Jan 2021 13:08:43 -0800 (PST) MIME-Version: 1.0 References: <202101221230.10MCULuw000439@gitrepo.freebsd.org> <30b9e294-6767-abd4-e3a3-7a2d268323f9@selasky.org> In-Reply-To: From: Warner Losh Date: Fri, 22 Jan 2021 14:08:32 -0700 Message-ID: Subject: Re: git: e006b6a2c1b9 - stable/12 - MFC 376479200760: Fix whitespace in mlx5en(4). To: Kyle Evans Cc: Hans Petter Selasky , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org X-Rspamd-Queue-Id: 4DMsLj1CPwz4R7g X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jan 2021 21:08:45 -0000 On Fri, Jan 22, 2021 at 7:26 AM Kyle Evans wrote: > On Fri, Jan 22, 2021 at 8:19 AM Hans Petter Selasky > wrote: > > > > On 1/22/21 2:59 PM, Kyle Evans wrote: > > > For the record, as per [0], these should have been cherry-picked using > > > -x which adds a " (cherry picked from commit ...)" annotation at the > > > bottom. With the annotation in place, the leading MFC line can be > > > dropped and the original message otherwise preserved (dropping any > > > metadata at the bottom that makes sense, e.g. "MFC after" tags). The > > > -x line helps at least the MFC tracker match the commit from main. > > > > > > Thanks, > > > > > > Kyle Evans > > > > > > [0]https://github.com/bsdimp/freebsd-git-docs/blob/main/MFC.md > > > > Hi Kyle, > > > > Shouldn't the committers-guide be updated to reflect this is now the > > official way to do it? > > > > https://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/ > > > > The committers guide wasn't going to be updated with the contents of > Warner's freebsd-git-docs until the doc switch to a less arcane > format. > It will be updated when the switch to asciidoc is done + a couple of days. For the moment, my MFC doc takes precedence over the committers guide. Warner