[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Process for cherry-picking patches from other projects


  • To: Julien Grall <julien@xxxxxxx>
  • From: George Dunlap <George.Dunlap@xxxxxxxxxx>
  • Date: Mon, 16 May 2022 15:26:54 +0000
  • Accept-language: en-US
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
  • 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=U5ioPv1ZSZK2Cx2QMXhFiXo5oWDmtWmFZAFjma3ja4s=; b=mQ+xbfksmcMqWGBT41Xpll8GlI+MMyHDxpA+kfjzvQQvgKjGXy5BccSZ+AolWbLe67c4ZypFa1LDpYHMqsbwWZ4PhyI9STWcVICbfgi28gwGiq6Rw3HCee8QG6WYL6099MAb/nxjmrmEfjjM5ec5VjWLh7slVx0xWzRP/esQhNDXIpuMAI+3dMby0WezFjYdghOXJTZrQv6UxdU3/4+LvtYG48il6CYHcmVF1Iq8BMUq3J9jSV4VTugtC75w6qJPKcF0YBkPP0rq+1nrRetW2NOn2PU1GWkcHkav1WLE2nYhZiZVVjKVB+jm5dky/V6qWQDZHk2gpg3vf+UcQRZCYA==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RlVKw9hzAVy4lxLQ573sW/sw6BCUDmwECDrDHb1cp1LdpTdeccGoWfn++oy7Fujb1g5y/MgXSPalQPVNBdjgvhaRuUKJVGOT+aucxntxXbTPdfVO5U2sfVmi9bOBhyE+baotGwjC1+RroRBOFDJngggkF1xaMuMo5R9iK27u1QbvbS49SxoNIL3pLiWi6nIlwH/FhRej+mo3K6sHfpi0XPmlEJ9pfliKOcgDavMexSs01OEVusP3N0mpCziDHK4A3jGnYAHojJIXqyBu7NQj9XmaKBQ9WnihaqAgnlcf11BoIBUDrQKVtuCERcY21YtVIQDUPxJBTs7zAGHLcfwhXA==
  • Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com;
  • Cc: Andrew Cooper <Andrew.Cooper3@xxxxxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, Bertrand Marquis <Bertrand.Marquis@xxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxxx>, Juergen Gross <jgross@xxxxxxxx>, Roger Pau Monne <roger.pau@xxxxxxxxxx>
  • Delivery-date: Mon, 16 May 2022 15:27:09 +0000
  • Ironport-data: A9a23:rD8hP6n906Cq1W5TnaTAz+jo5gwvJ0RdPkR7XQ2eYbSJt16W5oA// 9YtKSrfbaHbJie3LscnK96GQXl2ucfSyNQyHlZrpCpjF3xE9ZLJD43GdRuqMynIf5adHRw84 5lBZ4nKd5w+QCSF+RmjaLK79HJ23PmGH+ejV7DOYkidKeMcpAIJ0HqPzMZl0t4AbaGFPj6wV fPOT+z3ZVP5hW4vbzNIsv7e+Rkx7Pmq4W5D7lZuO6wb7Q+Cx3VEUJ5HKa+PdHapGYM88sxW5 grgIBNV2kuDon/B3/v8yu6TnnUiG+KUZU7U4pZvc/DKbiJq/0Te6Y5mcqtFAatro2/RxYopl YwT7cXYpToBZcUgpsxMC3G0LAkmVUF20Oevza+X6JH7I+XuKhMA8t02ZK0EFdRwFtVfWAmiw ccwOjEVBi1vssrtqF6NpkuAsex4RCXjFNt3VniNVlg1B95+KXzIa/2iCdO1QF7cLy2BdBrTT 5NxVNZhUPjPSx5MYG4VCoo1p/ep2EijdzZXp2u7hINitgA/zCQpuFTsGPz8X4TQAOlwxQOfr G+A+HnlCBYHMtDZ0SCC7n+nmu7Im2X8RZ4WE7q7sPVthTV/xERKUEFQCQT9/Kf/1hTWt9F3c iT4/gIBoK8o+0HtYsT7WxSgiHWFogQdS5xbFOhSBASllfKLsl/AWTJsojhpbtYBlsQZfgAT2 xyOn9XvHB5js4XKVifInluThXboUcQPFkcAeCsFQA0t89Tl5oYpgXrnTNxuDaq0hd3dAizrz naBqy1Wr58el9IR3qO3u3XOmSuxp4PhRxQwoA7QWwqN9RhlbYSoY4ip71nz7vtaKoudCF6bs xAsi8WYqewDE5yJvCiMW/kWWqGk4e6fNz/RikIpGIMunxyv9GSkZpt4+yxlKQFiNcNsRNPyS ErauAcU6JoIOnKvNfBze9jpV55syrX8H9P4UPySdsBJfpV6aA6A+mdpeFKU2Gfu1kMrlMnTJ KumTCplNl5CYYwP8dZ8b711PWMDrszm+V7ueA==
  • Ironport-hdrordr: A9a23:Wj3Su6yrztsT4z+isi96KrPxgOskLtp133Aq2lEZdPULSKGlfp GV9sjziyWetN9IYgBapTiBUJPwIk80hqQFm7X5XI3SETUO3VHFEGgM1/qE/9SNIUzDH6tmpN 9dmstFeZHN5DpB/KDHCWCDer5OruVvsprY/Ns2pE0dLz2CHpsQizuRfTzrd3GeKjMnObMJUL 6nouZXrTupfnoaKu6hAGMeYuTFr9rX0Lr7fB8vHXccmUezpALtzIS/PwmT3x8YXT8K66wl63 L5nwvw4bjmm+2nyyXby3TY4/1t6ZrcI5p4dYyxY/ouW3fRYzWTFcFcsnq5zXQISdSUmRUXeR /30lAd1opImjXslyqO0GbQMkHboUoTAjnZuBClaDLY0LLEbSN/BMxbiY1DdBzFr0ImodFnya pOm3mUrpxNEHr77WzAD0ihbWAUqqOYmwtVrQcotQ0XbWLeUs4ikaUPuEdOVJsQFiPz744qVO FoEcHH/f5TNVeXdWrQsGVjyMGlGi1bJGbNfmES/siOlzRGlnFwyEUVgMQZg3cb7Zo4D51J/f 7NPKhknKxHCsUWcaV+DuEcRtbfMB2HfTvcdGaJZVj3HqAOPHzA75bx/bUu/emvPIcFyZMj8a 6xJ2+wdVRCD34GJff+rKGjqCq9MVlVdQ6duf129tx+pqD2QqbtPGmKVE0u+vHQ1skiPg==
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
  • Thread-index: AQHYZtZ1suK3TAKIFU2tuY9R7u+Tcq0hnruAgAAEpYCAAAGxAA==
  • Thread-topic: Process for cherry-picking patches from other projects


> On May 16, 2022, at 4:20 PM, Julien Grall <julien@xxxxxxx> wrote:
> 
> 
> 
> On 16/05/2022 16:04, Andrew Cooper wrote:
>> On 13/05/2022 15:33, George Dunlap wrote:
> 
>> IMO, a commit message saying "port $X from project $Y" makes it crystal
>> clear that the original code change isn't mine, but the porting effort
>> is.  Amongst other things, porting invalidates any review/ack/test chain
>> because those tags were given in the context of the original project,
>> not Xen.
> 
> This seems to contradict our documentation:
> 
> "All tags **above** the `Origin:` tag are from the original patch (which
> should all be kept), while tags **after** `Origin:` are related to the
> normal Xen patch process as described here."

And indeed, part of the the point of that paragraph is almost certainly to clue 
you in that the “Tested-by:” is for the original commit, not the Xen commit.

That paragraph is clearly expecting the case where individual commits are 
cherry-picked, not batched or done with an entire file.  In large part we seem 
to be in agreement, so we just need someone to do some wordsmithing of some 
text to update that file for the “batch update” and “import a full file” cases.

 -George

Attachment: signature.asc
Description: Message signed with OpenPGP


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.