From nobody Wed Jan 31 04:57:10 2024 X-Original-To: dev-commits-src-main@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 4TPqX94LMkz58Q5D; Wed, 31 Jan 2024 04:57:13 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (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 4TPqX922TPz4ZdL; Wed, 31 Jan 2024 04:57:13 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTPS id V2Xcr6ucEGAIJV2eurDUWX; Wed, 31 Jan 2024 04:57:12 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id V2etr8mef9Cr4V2etr22VI; Wed, 31 Jan 2024 04:57:12 +0000 X-Authority-Analysis: v=2.4 cv=etl8zZpX c=1 sm=1 tr=0 ts=65b9d328 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=dEuoMetlWLkA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=uaIHpgkpcgMenpJzt6UA: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 BC322173B; Tue, 30 Jan 2024 20:57:10 -0800 (PST) Received: from slippy (localhost [IPv6:::1]) by slippy.cwsent.com (Postfix) with ESMTP id 9DD1E23D; Tue, 30 Jan 2024 20:57:10 -0800 (PST) Date: Tue, 30 Jan 2024 20:57:10 -0800 From: Cy Schubert To: Jessica Clarke Cc: Jung-uk Kim , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 722b16673c40 - main - acpica: Import ACPICA 20230331 Message-ID: <20240130205710.11cf19cf@slippy> In-Reply-To: <3BE4D4E2-DFF3-4F68-B3D3-8CE9C27089A5@freebsd.org> References: <202401310406.40V46AUG000837@gitrepo.freebsd.org> <3BE4D4E2-DFF3-4F68-B3D3-8CE9C27089A5@freebsd.org> Organization: KOMQUATS X-Mailer: Claws Mail 3.19.1 (GTK+ 2.24.33; amd64-portbld-freebsd15.0) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4xfHiR2Vbattp0EJYfb0VzIw1wBo0c5qGdijJ+YoTID/mWmkknGvwGzVIO7KHQ+zwn7ZNZcWYu0/64SKYDkWnF378jKqSApVY5tXp2NfGxqR2CY5FXouBR Lay/5VQIeQrIdP6eEl6FLF1TeUJuwdcDn2gpEUZrnhXPg9xylIx7q5StY0kAx1hZIp7Ckl7NKNbdb9VEj/wrwXXfXe75KmPzXgP69grK8FoyK4BcddK2eKn3 g9scU3QcuNYlkznVuDy83p6HWVJrKyLwUh4mLefyM1MX/+4Crn5Cvj2lUkc6nH48ZxuNVlkm0ZjwlrrNbMdnxNn17g5o89uAIGuiEI8ya7X0SWMAsflhLWyy 0ba9K56p X-Rspamd-Queue-Id: 4TPqX922TPz4ZdL 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] 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=722b16673c40aedf280895f2f2f676bb494518d7 > > > > 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? -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0