From nobody Wed Jan 31 05:17:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPqzt3XF6z58RwD; Wed, 31 Jan 2024 05:17:46 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TPqzt2YYXz4cwj; Wed, 31 Jan 2024 05:17:46 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4003a.ext.cloudfilter.net ([10.228.9.183]) by cmsmtp with ESMTPS id UmJ7rWhhnxDxGV2yorGrDc; Wed, 31 Jan 2024 05:17:46 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id V2ymrApUsByQrV2ynrRC4C; Wed, 31 Jan 2024 05:17:45 +0000 X-Authority-Analysis: v=2.4 cv=UOF+Hzfy c=1 sm=1 tr=0 ts=65b9d7f9 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=dEuoMetlWLkA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=jx4tM7Ehyi6vgjVKVF0A:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 1A5CB1769; Tue, 30 Jan 2024 21:17:44 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id EDDE915B; Tue, 30 Jan 2024 21:17:43 -0800 (PST) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Warner Losh cc: Cy Schubert , Jessica Clarke , Jung-uk Kim , src-committers , "" , "" Subject: Re: git: 722b16673c40 - main - acpica: Import ACPICA 20230331 In-reply-to: References: <202401310406.40V46AUG000837@gitrepo.freebsd.org> <3BE4D4E2-DFF3-4F68-B3D3-8CE9C27089A5@freebsd.org> <20240130205710.11cf19cf@slippy> Comments: In-reply-to Warner Losh message dated "Tue, 30 Jan 2024 22:07:56 -0700." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 30 Jan 2024 21:17:43 -0800 Message-Id: <20240131051743.EDDE915B@slippy.cwsent.com> X-CMAE-Envelope: MS4xfLq8LlQ5Y+h9Tx6mtFgSmRUtfNY9LCDKyZa7nt+IJmHvdL0rLnkEUJd0ZPyPtaVrmn6rfxp97PvPlfijLMn7GjfFDAVYUVECPHmwDbBhmfEpEeDXEJBS 06Ji84iI5ZtLu7S1/uZzp742B7YhAVTE76+9xCln3Pb8wuVeYV+YtPBD49CRYecNT+DJvbuk8eSW2rri54vZ+6G2G9zOC3AM+VSdnduRs4bj88tYXN0IW9u9 5bROMeg4WymH4upcIuBIQ578ilmicgeeFnd3F5Gt5D3YiO8RDczhONrS1DeR2MXkyHQ5zckMxg7bgcmF3HtruE/eRNsr3WTgUkwxtEsg387UuIIofdfSFtda I5ob9xOhsttk05utOy0lEt6Mjow15g== X-Rspamd-Queue-Id: 4TPqzt2YYXz4cwj X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] In message , Warner Losh writes: > --00000000000054b556061036dd0f > Content-Type: text/plain; charset="UTF-8" > Content-Transfer-Encoding: quoted-printable > > On Tue, Jan 30, 2024, 9:57=E2=80=AFPM Cy Schubert m> wrote: > > > On Wed, 31 Jan 2024 04:29:18 +0000 > > Jessica Clarke wrote: > > > > > On 31 Jan 2024, at 04:06, Jung-uk Kim wrote: > > > > > > > > The branch main has been updated by jkim: > > > > > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=3D722b16673c40aedf280895f2f2f676b= > b494518d7 > > > > > > > > commit 722b16673c40aedf280895f2f2f676bb494518d7 > > > > Author: Jung-uk Kim > > > > AuthorDate: 2024-01-30 21:43:45 +0000 > > > > Commit: Jung-uk Kim > > > > CommitDate: 2024-01-31 03:16:36 +0000 > > > > > > > > acpica: Import ACPICA 20230331 > > > > > > > > (cherry picked from commit > > 8e013e1e3b81740266738226667431cf5c28b17a) > > > > > > Cherry-pick not merge for a vendor merge?.. > > > > Probably not Kosher but, a general git question about cherry-picks vs > > merges. A cherry-pick, without the -x but specifying the source branch, > > results in no cherry picked merge but a merge of the last commit of the > > source branch to the current branch. > > > > Can someone explain this? And if this would be any different from a > > merge from a branch that is ahead by one commit since the last merge? > > > > This is functionally identical in the resulting tree, except only one > parent is recorded for the commit. If there were no fixups needed, the next > merge would automatically skip the cherry-picked commit due the commit > hashes matching. However if fixups were needed, there may be conflicts on > the next merge in cases I can only hand wave about, but have hit once or > twice. A merge seems to be better because it only looks at changes since > the last common ancestor. I think a merge would handle the need to revert > better, though my experience with awk is making me question that. I understand the patches would be the same -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 but would the history graph be different? Or does that matter?