)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"fa2364d3c6af7b86155b1dcb74fc0d8f9f9be7f5","unresolved":true,"context_lines":[{"line_number":14,"context_line":"Do not add VMCoreInfo when memory encryption is enabled."},{"line_number":15,"context_line":""},{"line_number":16,"context_line":"Conflicts:"},{"line_number":17,"context_line":"\tnova/tests/unit/virt/libvirt/test_driver.py"},{"line_number":18,"context_line":"\tnova/virt/libvirt/driver.py"},{"line_number":19,"context_line":""},{"line_number":20,"context_line":"Resolved conflict caused by renaming of _sev_enabled method by SEV-ES"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"8816560c_ff03905c","line":17,"updated":"2025-09-17 07:53:02.000000000","message":"nit: please avoid tabs in the future","commit_id":"32149071dab922eeb1875b199becbf970f083754"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"c07d10a09858faacbb24eb28dc10a03603807fd5","unresolved":false,"context_lines":[{"line_number":18,"context_line":"\tnova/virt/libvirt/driver.py"},{"line_number":19,"context_line":""},{"line_number":20,"context_line":"Resolved conflict caused by renaming of _sev_enabled method by SEV-ES"},{"line_number":21,"context_line":"support, which was merged during 2025.2 cycle."},{"line_number":22,"context_line":""},{"line_number":23,"context_line":"Closes-Bug: #2117170"},{"line_number":24,"context_line":"Change-Id: I05c7b1ae46ccd8d9aa42456b493ac6ee7ddd8bae"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"23a72ef5_d878d72f","line":21,"updated":"2025-09-09 09:33:16.000000000","message":"thanks for the explanation. looks correct. (patch Ifc9b86ad7db887cc22b2cd252fe8adc81fdc29c6 causes the direct conflict, but one small change is needed in the patch, due to patch I5968e75325b989225ed1fc6921257751ae227a0b)","commit_id":"32149071dab922eeb1875b199becbf970f083754"}],"/PATCHSET_LEVEL":[{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"b7151a097425eb4b2bf3dba143044031b5cef529","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"58cb551b_8c5f616c","updated":"2025-09-08 13:05:18.000000000","message":"Clean cherry-pick","commit_id":"dc0747ab004affebf4e201539686811a46d75830"},{"author":{"_account_id":9816,"name":"Takashi Kajinami","email":"kajinamit@oss.nttdata.com","username":"kajinamit"},"change_message_id":"c514bf3ee5682f326d0f397108a7c698cee6bc5f","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"63a8c66f_80e2b53e","updated":"2025-08-29 12:40:19.000000000","message":"This is prepared for early reference.","commit_id":"dc0747ab004affebf4e201539686811a46d75830"},{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"0c649b82ff350ea744f35925f33bc67e4e7eaa77","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":2,"id":"9816ed6c_d72116ab","updated":"2025-09-17 07:51:23.000000000","message":"Loooks good","commit_id":"32149071dab922eeb1875b199becbf970f083754"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"c07d10a09858faacbb24eb28dc10a03603807fd5","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":2,"id":"29a67ad1_6da73abf","updated":"2025-09-09 09:33:16.000000000","message":"This looks valid to me to backport. Conflicts are resolved correctly. Merged on master (stable/2025.2 branch is not yet cut). LGTM.","commit_id":"32149071dab922eeb1875b199becbf970f083754"},{"author":{"_account_id":9816,"name":"Takashi Kajinami","email":"kajinamit@oss.nttdata.com","username":"kajinamit"},"change_message_id":"66f63d850119b430ae2e0db33fbd8da25ebe3f60","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":2,"id":"13101832_3fbeebbd","updated":"2025-09-08 16:12:59.000000000","message":"recheck post failure","commit_id":"32149071dab922eeb1875b199becbf970f083754"}],"nova/tests/unit/virt/libvirt/test_driver.py":[{"author":{"_account_id":9816,"name":"Takashi Kajinami","email":"kajinamit@oss.nttdata.com","username":"kajinamit"},"change_message_id":"b846a38673c1ac37aac934855fa8906f4ae537a6","unresolved":true,"context_lines":[{"line_number":3531,"context_line":""},{"line_number":3532,"context_line":"        drvr \u003d libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)"},{"line_number":3533,"context_line":"        drvr._host._supports_amd_sev \u003d True"},{"line_number":3534,"context_line":"        drvr._host._supports_amd_sev_es \u003d False"},{"line_number":3535,"context_line":"        instance_ref \u003d objects.Instance(**self.test_instance)"},{"line_number":3536,"context_line":"        image_meta \u003d objects.ImageMeta.from_dict({"},{"line_number":3537,"context_line":"            \"hw_architecture\": fields.Architecture.X86_64,"}],"source_content_type":"text/x-python","patch_set":1,"id":"3c2d9f99_1f4d85db","line":3534,"range":{"start_line":3534,"start_character":8,"end_line":3534,"end_character":47},"updated":"2025-09-08 13:38:00.000000000","message":"I noticed I have to drop this ...","commit_id":"dc0747ab004affebf4e201539686811a46d75830"},{"author":{"_account_id":9816,"name":"Takashi Kajinami","email":"kajinamit@oss.nttdata.com","username":"kajinamit"},"change_message_id":"415dd2cded2f3a219b02d5610f1f2384e9c2d46c","unresolved":false,"context_lines":[{"line_number":3531,"context_line":""},{"line_number":3532,"context_line":"        drvr \u003d libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)"},{"line_number":3533,"context_line":"        drvr._host._supports_amd_sev \u003d True"},{"line_number":3534,"context_line":"        drvr._host._supports_amd_sev_es \u003d False"},{"line_number":3535,"context_line":"        instance_ref \u003d objects.Instance(**self.test_instance)"},{"line_number":3536,"context_line":"        image_meta \u003d objects.ImageMeta.from_dict({"},{"line_number":3537,"context_line":"            \"hw_architecture\": fields.Architecture.X86_64,"}],"source_content_type":"text/x-python","patch_set":1,"id":"5232113e_b3ff88b3","line":3534,"range":{"start_line":3534,"start_character":8,"end_line":3534,"end_character":47},"in_reply_to":"3c2d9f99_1f4d85db","updated":"2025-09-08 13:40:29.000000000","message":"Done","commit_id":"dc0747ab004affebf4e201539686811a46d75830"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"c07d10a09858faacbb24eb28dc10a03603807fd5","unresolved":false,"context_lines":[{"line_number":3531,"context_line":""},{"line_number":3532,"context_line":"        drvr \u003d libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)"},{"line_number":3533,"context_line":"        drvr._host._supports_amd_sev \u003d True"},{"line_number":3534,"context_line":"        drvr._host._supports_amd_sev_es \u003d False"},{"line_number":3535,"context_line":"        instance_ref \u003d objects.Instance(**self.test_instance)"},{"line_number":3536,"context_line":"        image_meta \u003d objects.ImageMeta.from_dict({"},{"line_number":3537,"context_line":"            \"hw_architecture\": fields.Architecture.X86_64,"}],"source_content_type":"text/x-python","patch_set":1,"id":"1a388634_757785b7","line":3534,"range":{"start_line":3534,"start_character":8,"end_line":3534,"end_character":47},"in_reply_to":"5232113e_b3ff88b3","updated":"2025-09-09 09:33:16.000000000","message":"yes, that was introduced with patch I5968e75325b989225ed1fc6921257751ae227a0b which is not present here. ✔","commit_id":"dc0747ab004affebf4e201539686811a46d75830"}]}
