From owner-dev-commits-src-branches@freebsd.org Sun May 30 19:38:22 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 4C231633155; Sun, 30 May 2021 19:38:22 +0000 (UTC) (envelope-from lutz@iks-jena.de) Received: from annwfn.iks-jena.de (annwfn.iks-jena.de [IPv6:2001:4bd8::19]) (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 4FtTHK74Cqz3lGP; Sun, 30 May 2021 19:38:21 +0000 (UTC) (envelope-from lutz@iks-jena.de) X-SMTP-Sender: IPv6:2001:4bd8:0:666:248:54ff:fe12:ee3f Received: from belenus.iks-jena.de (belenus.iks-jena.de [IPv6:2001:4bd8:0:666:248:54ff:fe12:ee3f]) by annwfn.iks-jena.de (8.15.2/8.15.2) with ESMTPS id 14UJcBbI018891 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sun, 30 May 2021 21:38:12 +0200 X-MSA-Host: belenus.iks-jena.de Received: (from lutz@localhost) by belenus.iks-jena.de (8.14.3/8.14.1/Submit) id 14UJcBCN025642; Sun, 30 May 2021 21:38:11 +0200 Date: Sun, 30 May 2021 21:38:11 +0200 From: Lutz Donnerhacke To: Lutz Donnerhacke Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: Re: git: 8e77442a5a53 - stable/12 - liblias: clean up empty lines in .c and .h files Message-ID: <20210530193811.GA25440@belenus.iks-jena.de> References: <202105301926.14UJQUah021297@gitrepo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202105301926.14UJQUah021297@gitrepo.freebsd.org> X-message-flag: Please send plain text messages only. Thank you. User-Agent: Mutt/1.5.17 (2007-11-01) X-Rspamd-Queue-Id: 4FtTHK74Cqz3lGP 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-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: Sun, 30 May 2021 19:38:22 -0000 On Sun, May 30, 2021 at 07:26:30PM +0000, Lutz Donnerhacke wrote: > The branch stable/12 has been updated by donner: > > URL: https://cgit.FreeBSD.org/src/commit/?id=8e77442a5a53450d509004c7b09ccc0b82f4eaca > > commit 8e77442a5a53450d509004c7b09ccc0b82f4eaca > Author: Mateusz Guzik > AuthorDate: 2021-05-30 19:12:53 +0000 > Commit: Lutz Donnerhacke > CommitDate: 2021-05-30 19:16:30 +0000 > > liblias: clean up empty lines in .c and .h files > > Partial apply of a huge commit to libalias only > (cherry picked from commit 662c13053f4bf2d6245ba7e2b66c10d1cd5c1fb9) The whole commit is not applicable without an absurd amount of additional work. That's why only the subset of files was allowed to be modified by this cherry pick. If somebody will later apply the whole commit to stable/12, git should automatically notice the partial applied changes and will not complain.