From nobody Thu Jun 09 19:30:47 2022 X-Original-To: freebsd-current@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 B648F839102 for ; Thu, 9 Jun 2022 19:30:55 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) Received: from CAN01-YT3-obe.outbound.protection.outlook.com (mail-yt3can01on2056.outbound.protection.outlook.com [40.107.115.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "DigiCert Cloud Services CA-1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LJvMf3Crtz3Dv6; Thu, 9 Jun 2022 19:30:54 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XUExd1LUaoxTIynPRTiE5XZbmfeE21nCs4E0/VRXqQgBxz47vRw6amKXgOua2pCalYa1Qmi9OgLqZ655NRq/hbs34rJbeRS66l+LVeWNaRrWw1XQRRihT+/T0jv32OAUNDXB5P5Q450D4R7VZYUN532KPbCANcVuGCj8AXJQ/Jv4V8w0L8Zp9oV+pbNrFbV8BHbPGdtY/U3wlfq289Duk/5wPHvibzuNedIpLG1xVW92bHkoaG16LzMRafVKE1heY8OTIa4rarCR5qib1TZ/kmaat9Fl4NhAEQwkapovGyCX4jQMCnAv9oatZTiNabSlnL2/iw2FU733zXSRwX297Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=sk3qYs5NhG4Aw8zoFkWMT8cqoQlHJpfNlnisPHML09U=; b=DZosHf6jK+rEtj+QvCDgtqxQucU76TXX4MNe4/0kmE3DZfV3wcs02aUyCtKjEF4spESCSe5ofHFV0AZGB7NoUAeDjcuJ4U1JRRjXG9BGQUqOdCUz9pkIP0wzA4/hML7drgfi0ehE+lWSHGTwjs4EILKi3K6AQIUZ0Buw7V+0ZhGXTn9ZYmJO4aZDKM638Fze7KHz6pG3puaBaQe+0U1ANaoBqwD/NqrIKz+bdYWzIdpEbAudoNUFoICpN8bN5MqtoSUNAaPI49jc+AFtX9j79WU4U90m3G8WyPaOPpCGK1Z0fGhZvoTg8rfEzQsEAPRYnGT4pwWiKRpmTl8dpDAfCQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=uoguelph.ca; dmarc=pass action=none header.from=uoguelph.ca; dkim=pass header.d=uoguelph.ca; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=uoguelph.ca; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sk3qYs5NhG4Aw8zoFkWMT8cqoQlHJpfNlnisPHML09U=; b=IZyrEUHsbmOQ0sqtoK3QHDB+ZjwdQUTEGt5Sw0b1FqwA0UhMEU5wFP8amzVRVbBi3g0NV6Zbgi+QmCioWWcBJ7V3ynapWcWCmjl7zsyIDH6MCTAEVOuCOTbAvtp/6SI8XY25hQmV8F4lJ8QpSvhcYaKMxujZoeTkZJD6vjzYzPdmGQtMZtCfrwkqpGIDquQHM2j0nWUJlfah5PcA1PL/YL07NROejKTEZhc6RKrP61NRk3NNby5v5Z1IQcIl5v1ytA5ic9J6MprOsW1Jh9za9eyiitBeaeWd2w5ng8R9mTkMvMGeBAvvS/T8jOv4ha8H9J29/25tF3O/aF1p/5Yn8Q== Received: from YQBPR0101MB9742.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:81::14) by YT3PR01MB8881.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:7a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.12; Thu, 9 Jun 2022 19:30:47 +0000 Received: from YQBPR0101MB9742.CANPRD01.PROD.OUTLOOK.COM ([fe80::b921:251e:4a0b:54fc]) by YQBPR0101MB9742.CANPRD01.PROD.OUTLOOK.COM ([fe80::b921:251e:4a0b:54fc%7]) with mapi id 15.20.5332.013; Thu, 9 Jun 2022 19:30:47 +0000 From: Rick Macklem To: freebsd-current , "imp@FreeBSD.org" Subject: git question: How do I push a cherry-pick of someone else's commit? Thread-Topic: git question: How do I push a cherry-pick of someone else's commit? Thread-Index: AQHYfDb9qAbdi6yD7UG+3VvmpnWyNA== Date: Thu, 9 Jun 2022 19:30:47 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: suggested_attachment_session_id: 159dfdf9-137c-5323-6d64-cf3157e01cb4 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d69de792-387f-46b9-42e9-08da4a4e8e15 x-ms-traffictypediagnostic: YT3PR01MB8881:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: JcbsIBo3ofOOmubziTZ79OHkBFCFRIjLIYYQROwSnn+5pr3VzinTrGznKURXmW0EnLzwwsXJVZ/80VF8VY4iii1fxROphN0Z1JS333KULcOgaza5nxz3aG5LLDil2Gkt7OZfKM7HqFBluNcLqnnuq3o9FYJIMCGxPdzYOTqampcs2335gnPt9vXHnCbcw2/LOJarD7lePid+fOsAr/x32PHRK7Qt/CS5/fXHslthmOdYDygaLl92LAr0/yfjbtv/FhwPV+y/Y00/8nwvfjx8ArpprE1WdlNOfgKhZ1c2r+pVsgEjZXoQLnsY5GXyRetbTOGXJ0M3OTCoTp3EfOvJbsKYevP8tGU4hpA8feSL7Ul7QvbOG0C6IHRixUxp4YEJMuhjR8S1sJqYxk+2EBwp7XFx4tsF8h1EmpuhbOSyqteKpRJt2Z1hqTwo2NNvg6F08nODiAS6NulySrhmBLepbnTityRSgoL9Ow03WtbnT6qo669rXn/w91ahzKZYukzfFGwIdA3taZOSlkYNwCFr70jr2Owvdhs13UV+tQxpLi3hVWo3QC2/5iNPPGhEMOLsVJdpZE37pajP7CUP3fz68aVFTsitcOcWHViinOeAbeauO4a7Rf7IfbNEXDAVn4jfiddv8sfHnYQ6SKkmf957AKLv78Qa6mlGVT7+9A4ql0p1mMEg4kj0pZjNXorWYHKO4LOmXVuZF6LbTcvmWWzCwQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:YQBPR0101MB9742.CANPRD01.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(450100002)(91956017)(38070700005)(64756008)(8676002)(66476007)(66556008)(66946007)(76116006)(2906002)(508600001)(5660300002)(55016003)(33656002)(122000001)(52536014)(66446008)(8936002)(4744005)(71200400001)(786003)(316002)(38100700002)(186003)(86362001)(9686003)(6506007)(7696005)(110136005);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 2 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?idGo4BelLW74Z0kntFY4UL0sHx8Y8T78lQrlDdGcNfhmtoF7jZOZ0gp/Si?= =?iso-8859-1?Q?CQCy/nU/TErSODznIqOLEZaOFKj+Tl2Y10COh7oSb5NK7A7+nmJTbXXHqf?= =?iso-8859-1?Q?rRJ/PBKk7wM0TUXx/VrhFRoVbhDxOBL5GXaoDqwOpO79AIHTXN6mgvq8y+?= =?iso-8859-1?Q?CM1bYr+pDMSip6gMBNb8nInkSs33bO3krQqiC7htlcoVFYxiqLZmSqV2+p?= =?iso-8859-1?Q?P4cAsmvCA3hHMAejqxfI+ZqAMurls4rJGkXFRTHEbuYe3Cmb5Mx7Pmv5/m?= =?iso-8859-1?Q?Ba7IeYZz+rkNFNRVdQcrxwHpbPbcXogfyzobMs8E1tP1QlTIYPMP1huA42?= =?iso-8859-1?Q?Eqk1jYanyu7vKVCGxTktOMvLfYbBZ1/QBi0LzxneO7kRALd9MdjVendovK?= =?iso-8859-1?Q?R03T3y6Z+XKKTfYdqmb3DpoFf5HJM/YuQXOwEXwnqR9uhy4Mp59nWU/IYx?= =?iso-8859-1?Q?lUa/9FS2Jc5i/E5+nW94EdLp2P5FaXWmV4r3C8FF2HKwCaLzd/3GLjlM8/?= =?iso-8859-1?Q?RwQ2YQuFNcIUixdTyj8QwJDlpHGaOlcki+D3qsAxj2+V0uo4Op/41qQsC3?= =?iso-8859-1?Q?SpfeRckFOq6zY6g02qW9P0bu/CwWbbU9gDjv2jPWlVAIaiA+OIovrzQJ8P?= =?iso-8859-1?Q?Sd5qMYtL54vaPVFh4PowNdv6uYCGqqankP8503aqPruKxbkXvcBo0B12fm?= =?iso-8859-1?Q?jBVm1H2mzF/56LQGO1S0oKgkzvAm+edoHg/ryXIV1Iv+5xgzqBM1k/Yjh8?= =?iso-8859-1?Q?FhDqR+XWNG3Cwki2Kod4rzZ+4PTW+thpSqWoLODc3Qq2VV75x/t8Zelp/I?= =?iso-8859-1?Q?p6eInINDF4cHH38U6wCWIpXX5MXG5J5eIB19nI38T37ngQhL/CUJ0Oh1im?= =?iso-8859-1?Q?LqBHsEWgyrZt3gNQkQaATrxCIhh4xgxq05Ktop8/PRBI0oTdVj5j4z7ehd?= =?iso-8859-1?Q?gjxpX61JdWxQs1SJozizNXrEJlSWSltAmwOHeB5KR9j3lWVWAWnGNCbaM2?= =?iso-8859-1?Q?jRGfHHDcR3Yi74cybw38UeZmYKzzOwIIzBFj3/qwjxrt20XZmSK2DvMn3r?= =?iso-8859-1?Q?R/rknt5gHtcODTdWKFtQ4ZvkkLoKl1TRToYZfNMMlzCq7Kdc2LGYJgB9Jl?= =?iso-8859-1?Q?Y8R2tquYMGEEbcpzyvvnevDz9GwoWETEPvQqISa+ixQdHVfYLFC/Smp1Lt?= =?iso-8859-1?Q?6Of7f5uial7Q0b4lw1SqiDjEKvBTFD9uhJNvnSuItBZkFprFLdfoypjJ6r?= =?iso-8859-1?Q?b+T7ZEXKF7JpHHexTquF03bioj2YOKKhfRW3wqHs7gPYxAE9JnoI+zahgp?= =?iso-8859-1?Q?K6icEiYiGx9S5b0ZI5wkcUuoeMkdXp/de0/5gdh8MknyWipWn8xNRcD7SI?= =?iso-8859-1?Q?f40QGe9lr4BIAD7LpR3PNInanMeSlSaGu+JMzFAe43vwc6e35y09MzRVv9?= =?iso-8859-1?Q?vzKtIoJ4rAEUKfmJhfvNNkGerO0VzwlInJ35SOCqDZ1nj59KOpUjy6D9Qz?= =?iso-8859-1?Q?bCkszOlPmnljBnC5irncQWOUGavtONN8f3NLkEOdJKnB1uDV7MKRnu9IaX?= =?iso-8859-1?Q?t2ESAJjdt8+5/zhKacDxjj5s5tfPUiSRaJWfxftCVeoOyDbectuakZuGAU?= =?iso-8859-1?Q?+C+d1tDhmcyeLCErhW3b2Jjtp2pywxkGaL2YMaff3Uulg/t++z71wybdFT?= =?iso-8859-1?Q?9M6CgBZ4JqqOP+uJ9BRhyrvt23405Lhca90MttvilKZ+x6y2oYWir7o6sj?= =?iso-8859-1?Q?Dvhp+ON+iyl0KvJ53v/N6dwFqbiS7mZPrChOSclU3yMDbqncmZlSCzdE/n?= =?iso-8859-1?Q?MgkyKJ76a3W1xYjLu9wP41JVoxtoy9kF5OONcM+Ql2LniOnwbn0L87my1O?= =?iso-8859-1?Q?Fd?= x-ms-exchange-antispam-messagedata-1: Q7a5gtAb98hKeA== Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 X-OriginatorOrg: uoguelph.ca X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: YQBPR0101MB9742.CANPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: d69de792-387f-46b9-42e9-08da4a4e8e15 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jun 2022 19:30:47.7852 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: be62a12b-2cad-49a1-a5fa-85f4f3156a7d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: yI04WIx3LhS16/mBCPHNhqcXzsdkelm/Q1WPlhElm0aAJ9Ugj9h+S9uHV3WsG0xA0HQJ5kkKbJvINR2Uhdgrqg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: YT3PR01MB8881 X-Rspamd-Queue-Id: 4LJvMf3Crtz3Dv6 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=uoguelph.ca header.s=selector2 header.b=IZyrEUHs; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=none) header.from=uoguelph.ca; spf=pass (mx1.freebsd.org: domain of rmacklem@uoguelph.ca designates 40.107.115.56 as permitted sender) smtp.mailfrom=rmacklem@uoguelph.ca X-Spamd-Result: default: False [-5.00 / 15.00]; TO_DN_EQ_ADDR_SOME(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[uoguelph.ca:s=selector2]; FREEFALL_USER(0.00)[rmacklem]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:40.107.0.0/16]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_LONG(-1.00)[-1.000]; ARC_ALLOW(-1.00)[microsoft.com:s=arcselector9901:i=1]; DWL_DNSWL_LOW(-1.00)[uoguelph.ca:dkim]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[uoguelph.ca:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[40.107.115.56:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[uoguelph.ca,none]; MLMMJ_DEST(0.00)[freebsd-current]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; SUBJECT_ENDS_QUESTION(1.00)[]; ASN(0.00)[asn:8075, ipnet:40.104.0.0/14, country:US]; RCVD_TLS_LAST(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[40.107.115.56:from] X-ThisMailContainsUnwantedMimeParts: N I just tried to MFC a commit done to fix my commit by imp@=0A= and it won't let be push the cherry-pick.=0A= =0A= What's the trick to doing this?=0A= Or do I need to get Warner to do it?=0A= If so, it's 393b7606f9c1 in main, that needs to go into stable/13.=0A= =0A= rick=0A= ps: The stable/13 build will be broken until this gets resolved.=0A= I'll revert the MFC if it isn't fixed soon.=0A=