From owner-dev-commits-src-all@freebsd.org Sat Dec 26 05:36:55 2020 Return-Path: Delivered-To: dev-commits-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 442994D7796; Sat, 26 Dec 2020 05:36:55 +0000 (UTC) (envelope-from yuripv@yuripv.dev) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D2sxz0wXkz4skg; Sat, 26 Dec 2020 05:36:54 +0000 (UTC) (envelope-from yuripv@yuripv.dev) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 995C65C0094; Sat, 26 Dec 2020 00:36:54 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sat, 26 Dec 2020 00:36:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yuripv.dev; h= subject:to:cc:references:from:message-id:date:mime-version :in-reply-to:content-type:content-transfer-encoding; s=fm1; bh=o /qhCXzy/XJITnG9lAO+UHmDEL4s3vDiriK36dUnI1c=; b=RiB45vJ1TJGajEfUj LvBz2RFsUzWL50+aK0x7v6vRfeobWeq5wLcHfZWN0HuMKR+fJi/9vf3+A3Zl4OD0 QKQTa+LkY1UFkDpL5AtMbe/ToNFxQ1W86CeHZ2jKQggl+5KmOI0YV9IK0ZXBOCoG V0B5LWWbY7cVL4ZDaT9tbVjHvqaEcyZf6w9pvrnWkcjiPhckmBHJuXWVyH9/T6Av C06pp1Px4DGakjH0va2Hsi5udpCT/SiY7ZzAd2NuOWyBrlVXsVmNqosbFA0DWfVX pzI+obTkls7BcjIMMWDtLrKK/Uk+Iigv+0+yEVjXej1eDDg5v++yQCMm4fGEo5Gy Y2eIA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=o/qhCXzy/XJITnG9lAO+UHmDEL4s3vDiriK36dUnI 1c=; b=XZgv+tp4mw3Eox+g/KJQSslm5BVO9eDhp7B7HLxTWY5okJby7OtGT/AQK /L0C0O83PQGQSSJPH6wxAPMgjcQWvq9ZwAjNzLTSoH6IGYguHLo1gmrGff8xiQty ot0WDrEQdRwAjU5jQaTJXguSMSSCA5rRX0Ekxmi1ld1By/IUDYRwXmamQj0H0Qc+ QZ1x8I7vv6ikKnKvo+PzhCbL/SLtM0BIceMCfdFTAQNueg2mNJ3bBwLftOgd3FjY ltzA/ZpeGWi7Ihluc/vLcEsKqqPLCVMmv2sQ3kkojqZlxLMSZEc85FKhFzKzhtwo jXVKQ4qPiQ0mMaF1oO7iHkIhvKncw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrvdduvddgkeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvfhfhffkffgfgggjtgfgsehtke ertddtfeejnecuhfhrohhmpegjuhhrihcurfgrnhhkohhvuceohihurhhiphhvseihuhhr ihhpvhdruggvvheqnecuggftrfgrthhtvghrnhepudeuffegtdehffdtffefkefhgfelie eitefghfeugeelfeduffegtdeufeekgfdvnecukfhppeeluddrvdegtddruddvgedrudeh keenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpeihuh hrihhpvheshihurhhiphhvrdguvghv X-ME-Proxy: Received: from mercury.lan (unknown [91.240.124.158]) by mail.messagingengine.com (Postfix) with ESMTPA id 4242C1080059; Sat, 26 Dec 2020 00:36:53 -0500 (EST) Subject: Re: git: 162b82dfa0cb - MFC r355876 (by cem): To: Warner Losh Cc: Andriy Gapon , Vladimir Kondratyev , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org References: <202012251825.0BPIPntO091296@gitrepo.freebsd.org> <751dc337-b4dc-52de-f2ee-a843eb5e43c5@FreeBSD.org> From: Yuri Pankov Message-ID: <20be96cf-1cda-d914-5759-aae90169d8c0@yuripv.dev> Date: Sat, 26 Dec 2020 08:36:52 +0300 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4D2sxz0wXkz4skg X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Commit messages for all branches of the src repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Dec 2020 05:36:55 -0000 Warner Losh wrote: > > > On Fri, Dec 25, 2020 at 10:31 PM Yuri Pankov > wrote: > > Andriy Gapon wrote: > > On 2020-12-25 20:25, Vladimir Kondratyev wrote: > >>     MFC r355876 (by cem): > >>      > >>     acpi(4): Add _CID to PNP info string > > > > > > I think that it would be better to merge those two lines into one. > > From the perspective of git log --oneline. > > Indeed, the MFC stuff does not make much sense anymore, I'd rather see > real commit message, even if it's just git tooling showing first line of > commit (--oneline, eh?). > > > I was rather hoping we'd land around using the old commit message, as > is, and let the cherry-picked message at the end signify the MFC, at > least for simple cherry-picks. > > For squashed ones, a sensible new summary line and an appropriate commit > message would be good as well... Where appropriate is approximately what > we do today, with all the hashes that we're merging mentioned. I am following the docs (and those make sense to me), `git cherry-pick -x` is just enough; if it's direct commit, I'd add a note. So yes, any commit to stable/* is MFC, unless stated otherwise.