From nobody Fri Jun 4 02:11:41 2021 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 05C2B136F0D3 for ; Fri, 4 Jun 2021 02:11:45 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) Received: from CAN01-TO1-obe.outbound.protection.outlook.com (mail-eopbgr670077.outbound.protection.outlook.com [40.107.67.77]) (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 4Fx5qM1kk9z3NTl for ; Fri, 4 Jun 2021 02:11:42 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ICs31ad9hzFPavIFs49S9tT1FDKgBU1TPgMWEmZlxXdXQRUGbOwK4Z3wRzqRQLtE367s2QI085NYnc60zBtXp3upY6nN681IRRfpd4GT+lSKBBTNsSFZA4w68r3ADZKzU7qDq3XJ7iAD8JOWF1DFNLuF9hQqWDXscJCccUzRbPdfjy8z9D7RVlQ+dQQP9oXWoWMXAZhuqZegZBWACFdiyEQl7BV35N54DA3+sNRMajci31K1BSB81Lci7NRPdgGwKMZEBqhrxKYw3r4kbzUlcFUzgvZfBelZnJnpkjZQqURzFNzLZTMgPs3F1k9SeK1nyMaIF5raJaSZZHkl5jtokQ== 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-SenderADCheck; bh=ScNloRPFI5+4qajPJ+BBjuJRJE/F8vlQuiP8rMbsmTY=; b=f72xzySlHUNepKdxjsyDSYK6TfsqKE9V6xTlTih7E+L/RfWIKGFj5ClMVkqp3lAl6WWZSem1J6a6oVhKUCxp5hH6s6UY8/K8u6lvo+upz3PC6xh9Dbd8vvzJ1M78VkaM/t8S3EOuhqj+aNyqzqSF8V1jEx/HBNKfvSYSWJBCrwdehLlX1TBHjMRYGue+kFq/nqCZB4ns5rY0JNs6hcvgkIxjgCIwMDqtdXWCWTAJRw5qcpPi82cmnQfiQgb5lqgKaVURpatCfdilHpMMcs3xivXhjzaT/0GnOMGmmwxWZhLh+A6P/CwMzQpYs1bbuAXObGnqnlhH/WNKhTOdFXspFQ== 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=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ScNloRPFI5+4qajPJ+BBjuJRJE/F8vlQuiP8rMbsmTY=; b=jorMUDPF/RtoXq/ri4+1wtMholgC4Ub/kzGpbJtTA7kIzRforEWybPC9qV6mySIButQlqeIivg1NYFlZnxeST8vYktxHPBaq15t2EOz/vqqyfSKwONyqOWoePDyA5SUeCElLYsxc0hZfirLtzk9w2lIli2YRTe5NWUZo5cbpRWvBsidKTb5OVCG8mdI55qFLSQe7ox0FY/aonUm+5BFjEK9gJGmLtzCVtJrgca1lu4iUumBWHALCAOEg+/a9xGxOURLIFA4lEzSxX0oHId895NUu5FPy+/XgcgfbyZ32blJZ7WZFjJYGjFztlh/yQE4lG4rS1Im/tSFoz9FyR7wrVA== Received: from YQXPR0101MB0968.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:19::29) by YQBPR0101MB2082.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.29; Fri, 4 Jun 2021 02:11:41 +0000 Received: from YQXPR0101MB0968.CANPRD01.PROD.OUTLOOK.COM ([fe80::583:528b:dbac:37bf]) by YQXPR0101MB0968.CANPRD01.PROD.OUTLOOK.COM ([fe80::583:528b:dbac:37bf%4]) with mapi id 15.20.4173.033; Fri, 4 Jun 2021 02:11:41 +0000 From: Rick Macklem To: FreeBSD Current Subject: git MFC/cherry-pick question Thread-Topic: git MFC/cherry-pick question Thread-Index: AQHXWOZVC/fQExE9AEmc04seojMvlw== Date: Fri, 4 Jun 2021 02:11:41 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f474f679-e660-4245-1c9e-08d926fe1827 x-ms-traffictypediagnostic: YQBPR0101MB2082: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2043; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: jBq5Zqnb6No5eyACchCaBF8LOh22sgZeAO3755mS897wccjrR0DUqCpAypN/3UeID7S18ykiwMETG/VrQg6+MqICRAbhFjU1cczE/ZEQ2f/KjBzsG91FJZFMvmP+tKBf2FzjXIJQjpPq++D63Zm9LW1MG9OyDY/jQj72A/djg5ob1dmhyc47cnPLJ2bTtQKnkMv9elLjxpg2LIvGPFRhaiPagApcSh8KF1dc4ID1xlqR4wSsrEnzbH9BjZSD9FtXYWg/fdDHTe9OSI+wnKnGMZZdNVyrZZ5m4sOk/QrQAnMhEJ0sqkTNGG5SfKRgwdAk6e+C39ViIxL+KEL89Lq7EwFtwlWHL6+0zwtiDt8RUGtJN1rdWv+dWY6tM3KXj6C2mhTqKNMneTVIHR6PKQetmo9ZSLIRqYn8ddxhxxA6Itk2/rz7Lvuh8xq8VdXD+IdcmM/uhgDGrwJ1kH0+johOPtJ3HzUB7f/mGds/IajJ8p9MdPHfj4tCbXI4h3De7ZR2NWY3G0q7IjW7QKortRYxvF7XAQBoXE1v7okIIBsap39Se5ILCQBlIY3/6Jac+V6NQdIcugjyL5kv2zTX0VBvhBNXc1+ZWUDyUBdfqPl42/E= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:YQXPR0101MB0968.CANPRD01.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(39860400002)(346002)(366004)(396003)(376002)(136003)(122000001)(38100700002)(86362001)(71200400001)(6916009)(186003)(64756008)(66446008)(66556008)(8936002)(9686003)(66476007)(76116006)(66946007)(6506007)(55016002)(8676002)(4744005)(5660300002)(2906002)(52536014)(316002)(786003)(33656002)(7696005)(3480700007)(478600001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata: =?iso-8859-1?Q?ek8nQNw3t17n5m36f/3BJvH0648Yoecr7JiwuX6e3IES/60ZWBA6YZ2p1U?= =?iso-8859-1?Q?vxliyGSM6222ZWdz5lIX46RiJkGADza4L9iVCI1z56N1n77sQ+1uN4tGXK?= =?iso-8859-1?Q?+RYFC4vmhQwSrMluVYlkKRS3ApZ2NE4f9QuSFN3nxs+ZLnDW8kCbCwmrkc?= =?iso-8859-1?Q?0ZdXR80DdXyhOooB4MEbFcBZ3spzVIulU/eSH+YVwHwLRfA335kVuf1619?= =?iso-8859-1?Q?OIJVRK6zgZfBAFuPM4F3qhAkFvNypL+WSKuUn5TxFrfEZ4ole+Vby1xJjv?= =?iso-8859-1?Q?pPYKytmmN/0u4BOxlzLqQyOtSDasavd8BF2GTlW6AIGBIKY3pFBcszncuy?= =?iso-8859-1?Q?tb/7zzGS7xP9kjtz89DO5gM73JPUbNMUv11StRiGywWrntGNAIiJqf7wA9?= =?iso-8859-1?Q?8xOpu1yoms7pVhZITnxLQOk5rNsfJGTy4KaPRjlIaehbSQNftIK2G9oMh+?= =?iso-8859-1?Q?yJ0tYFm3CWOwNnzrHSWdh1cbcgECH2+ImxfxDkByxN8v8ZFLQxHgNBs9GA?= =?iso-8859-1?Q?wRbeNJHn4pq1kOTptosl06CTtsDYOPpJIM1fV0HK61N1O6mxHY4KGN32y2?= =?iso-8859-1?Q?4YQSkZHcOLx/klpEMQNhpBXbRFsj7FBv288QifnxzPr9i3y4RsSNnAEj+g?= =?iso-8859-1?Q?ApKcTokyk4r6aAY8Aigk5rTOKZc1Hz9mCKZ4JOwSoTKDPl8U4LvspLjkrW?= =?iso-8859-1?Q?dmYbd8h+RPpuZD+MmChyLNJSObHEMPXuvcP1m2RQRFp94OihgA8cJ526yh?= =?iso-8859-1?Q?RiQ5z+G6M71IxxvIiDqm74Mb1/q/QqnTOjao583xsfgxVIwt5qiM6O8h3r?= =?iso-8859-1?Q?5EVwRrRBGrb+fdj5wGqa5fJD0ouRbsvk9kYS+/9EnuBA6Sl1vUzGakZRee?= =?iso-8859-1?Q?ZsKUXvLTZnIn/qtl6MzCbwYdve9+UkMoMva5uWSQp0YJgGDdjZdu/CTp6p?= =?iso-8859-1?Q?WQuxXYnpFUFY4wdto3s2xt+vDmBB80nsigJ0qypyNqoXuazCxIM5UfcU7A?= =?iso-8859-1?Q?utxg8fo02v9HuMjwtOvUPwWfHPeLwVg0zw+7VetY0/876E3SwZYRdcalrt?= =?iso-8859-1?Q?FOajCbbU8t3SSrmeyC8qXhNWPaLr+l/w3nx9T8/IfWM1GXzdm2c4CjdlxE?= =?iso-8859-1?Q?GU7sbX5XKODIRAFzrnJKuUapLeMfthVMKDr/aF6q7/HIXHO4Gte/iuciTK?= =?iso-8859-1?Q?3HePZWUvhW03b6b297/OJbnYLoBmj79TJX8qCjqJZ6zFoJenVBO0r5yqDf?= =?iso-8859-1?Q?VOe3O2h7LRdUg4YW0M+HFRGIJsZB41gt7D150zQteh2rq49NNoRNCOUgTH?= =?iso-8859-1?Q?7CYcWYiJCEiEvDd7KV5z18+ENo1xvFexJF13xpP2ivcZA/x+CvHUcEDHx/?= =?iso-8859-1?Q?yEFwk3koykT7QVS9ZGpw8Go0qtG1jO2Yd63f4K5zuuPzHB7ZvvKIs=3D?= x-ms-exchange-transport-forked: True 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: YQXPR0101MB0968.CANPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: f474f679-e660-4245-1c9e-08d926fe1827 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Jun 2021 02:11:41.7921 (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: 2RSZ5iGuV/TK7WE0Y2J6V1o+NNx/8eOQ0GFrycxWLLr5wUEKX4BSszxdpS9jC2m8RI08iskPDxZdhIkjd9krNg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: YQBPR0101MB2082 X-Rspamd-Queue-Id: 4Fx5qM1kk9z3NTl X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org; dkim=pass header.d=uoguelph.ca header.s=selector1 header.b=jorMUDPF; 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.67.77 as permitted sender) smtp.mailfrom=rmacklem@uoguelph.ca X-Spamd-Result: default: False [-6.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; RBL_DBL_DONT_QUERY_IPS(0.00)[40.107.67.77:from]; R_DKIM_ALLOW(-0.20)[uoguelph.ca:s=selector1]; FREEFALL_USER(0.00)[rmacklem]; FROM_HAS_DN(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]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[40.107.67.77:from:127.0.2.255]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[uoguelph.ca:+]; DMARC_POLICY_ALLOW(-0.50)[uoguelph.ca,none]; RCVD_IN_DNSWL_NONE(0.00)[40.107.67.77:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DWL_DNSWL_LOW(-1.00)[uoguelph.ca:dkim]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:8075, ipnet:40.104.0.0/14, country:US]; ARC_ALLOW(-1.00)[microsoft.com:s=arcselector9901:i=1]; MAILMAN_DEST(0.00)[freebsd-current]; RWL_MAILSPIKE_POSSIBLE(0.00)[40.107.67.77:from] X-ThisMailContainsUnwantedMimeParts: N Hi,=0A= =0A= I am trying to MFC a commit to stable/12.=0A= The cherry-pick works, but the resultant code=0A= is not correct and won't build.=0A= --> I broke the build yesterday and manually=0A= reverted the breakage.=0A= =0A= So, how do I do this?=0A= =0A= Do I have to manually edit the file after the=0A= cherry-pick and then do something like a=0A= git commit -a=0A= to get the edited change in, or is there a=0A= way to tell it to add it to the cherry-pick or ??=0A= =0A= Thanks anyone, for help with this, rick=0A=