From owner-dev-commits-src-branches@freebsd.org Fri Jan 22 13:59:27 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 3E11C4F5CE9; Fri, 22 Jan 2021 13:59:27 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DMgqM14kzz3Dd7; Fri, 22 Jan 2021 13:59:27 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 1099A2CEB6; Fri, 22 Jan 2021 13:59:27 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f174.google.com with SMTP id 19so5141423qkh.3; Fri, 22 Jan 2021 05:59:27 -0800 (PST) X-Gm-Message-State: AOAM5305aP/HuYyeCCIU/Qd7M6yrEzmjhLxFywpKUenmOJMAoncVfQa9 cdHK1ZO8XQbpEVkDnOg4/h/O4ZK+Obyo2UPgtFM= X-Google-Smtp-Source: ABdhPJzVRovve2g5YeGocMziZFy5OBtX9A8PIQ8FCm8DjVaumbHInoKZI6kwVCg6eyGuRJi8xVyHzB0rQmApAKKdUpk= X-Received: by 2002:a37:a342:: with SMTP id m63mr4985169qke.120.1611323966658; Fri, 22 Jan 2021 05:59:26 -0800 (PST) MIME-Version: 1.0 References: <202101221230.10MCULuw000439@gitrepo.freebsd.org> In-Reply-To: <202101221230.10MCULuw000439@gitrepo.freebsd.org> From: Kyle Evans Date: Fri, 22 Jan 2021 07:59:13 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: e006b6a2c1b9 - stable/12 - MFC 376479200760: Fix whitespace in mlx5en(4). To: Hans Petter Selasky Cc: src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Content-Type: text/plain; charset="UTF-8" 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 13:59:27 -0000 On Fri, Jan 22, 2021 at 6:30 AM Hans Petter Selasky wrote: > > The branch stable/12 has been updated by hselasky: > > URL: https://cgit.FreeBSD.org/src/commit/?id=e006b6a2c1b9a34e008ffbb4cabf86315f7873ff > > commit e006b6a2c1b9a34e008ffbb4cabf86315f7873ff > Author: Hans Petter Selasky > AuthorDate: 2021-01-08 11:44:42 +0000 > Commit: Hans Petter Selasky > CommitDate: 2021-01-22 12:08:03 +0000 > > MFC 376479200760: > Fix whitespace in mlx5en(4). > > Sponsored by: Mellanox Technologies // NVIDIA Networking > --- 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