From owner-dev-commits-src-branches@freebsd.org Sat Dec 26 05:33:49 2020 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 CB1654D7756 for ; Sat, 26 Dec 2020 05:33:49 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) (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 4D2stP2HPmz4sKx for ; Sat, 26 Dec 2020 05:33:49 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x82d.google.com with SMTP id y15so3879881qtv.5 for ; Fri, 25 Dec 2020 21:33:49 -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=ic+N1e9FXmcA3kj/hTXwnyHuoi9TvXlXrLeRkpU+BCk=; b=ntkOZ+KZg8kqE2yeSS5qVZqVUX9k1fadTCTXr3QYvT3fHeT/MNK22FQbVbWDSpKVJs 2BgekdevZRasVmnuwB/ZFqxJnPI2w6PSlTzEqpwLiTkAD/ptbatoDdtOe4927zFYZzFX TcJu9Q1Haie5OotjWs9irnQYDKqVwNTOh7rNd2P+DdfBkyFjYgsBz8HTySVoz4KUm4NF LKXdin665TrB4CbvCF3Ovg2OMRhGqbdH1WUszJsuLdMYx7ODteuLVyLvlBySlDk2daKJ nBglbR1AzUTN+WGeoiVD4ZgIovGiyqxnlYnmgfwi8fERGdoqtbEZYYFH/zytwKU3oQZN AbSg== 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=ic+N1e9FXmcA3kj/hTXwnyHuoi9TvXlXrLeRkpU+BCk=; b=R1nYVMMF3dzrqVt6hqHpvwqVYAEaQNwp9Rnf6DgVYTdK1tilf2VdRXLYx6yMK0HvDJ zk5WgRMLJZLYwO9q5sGpM37SVMIoa/zu59FgDluTBkTE1xVtiON1c+jvqeh2Qx1JW3dK ySXvtBPEbsIZLFk/t0ly3xiTPev+L1ct98X4TuDwdfkFGPNUoJqnCLKIdPKdJKSaP+MY hGmHmID7RL2/dl0EVScpagNfkIBLO8hEy4R6YBrpF45ebL4YC+O4zjj8/dRRqyM7MEmO 3sSdqinerVOK1ovDQQCfODNSJqZNbpRyqmZMuy4wGXuy7LY6Dbupj4aNmZslMkERjV88 kGjw== X-Gm-Message-State: AOAM532Yoal4r0mf5bSaaz11Lx/KCwriqm16EIA5S5wVsYQ+CdDhcgcg X5GEGvDEpUNW2vpv8Ckpm8KXIbEtR5PVW//D9O0v+Q== X-Google-Smtp-Source: ABdhPJxfGwWJVJaL4/BTE9cJ2urK6prQcJHiUc0bTA3CRwJ7rQZeGp/Cq5EteTUWp9nFrQ78TVcNvK0cR+N8Ze4w+zU= X-Received: by 2002:ac8:58d2:: with SMTP id u18mr34766810qta.235.1608960828036; Fri, 25 Dec 2020 21:33:48 -0800 (PST) MIME-Version: 1.0 References: <202012251825.0BPIPntO091296@gitrepo.freebsd.org> <751dc337-b4dc-52de-f2ee-a843eb5e43c5@FreeBSD.org> In-Reply-To: From: Warner Losh Date: Fri, 25 Dec 2020 22:33:37 -0700 Message-ID: Subject: Re: git: 162b82dfa0cb - MFC r355876 (by cem): To: Yuri Pankov Cc: Andriy Gapon , Vladimir Kondratyev , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org X-Rspamd-Queue-Id: 4D2stP2HPmz4sKx 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: "Commit messages for the stable branches of the src repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Dec 2020 05:33:49 -0000 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. Warner