)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"1ef4b6ca79399ce18ec5530287e5d9c24150179f","unresolved":true,"context_lines":[{"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"},{"line_number":21,"context_line":"support, which was merged during 2025.2 cycle."}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"b1aa20d7_036b6da3","line":18,"updated":"2025-09-17 07:52:31.000000000","message":"I guess this is not a new conflict but the original one from master -\u003e 2025.1. If so please drop it from the commit message in this and further backports.","commit_id":"586344172d621e2b7fc879c74621b1452431b5a1"},{"author":{"_account_id":9816,"name":"Takashi Kajinami","email":"kajinamit@oss.nttdata.com","username":"kajinamit"},"change_message_id":"aa0be41b83a60eeded45257935633332058a24e1","unresolved":false,"context_lines":[{"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"},{"line_number":21,"context_line":"support, which was merged during 2025.2 cycle."}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"e43718d0_b1a89c73","line":18,"in_reply_to":"b1aa20d7_036b6da3","updated":"2025-09-17 12:25:13.000000000","message":"Done. Yes this is the conflict detected in master-\u003e2025.1 backport.","commit_id":"586344172d621e2b7fc879c74621b1452431b5a1"}],"/PATCHSET_LEVEL":[{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"fc0fcd925986d10e57d9a7bbaa9090a05ec61553","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"3c0b02df_5f456c80","updated":"2025-09-08 13:06:52.000000000","message":"recheck openstacksdk build failures\n\nthis is a clean cherry-pick","commit_id":"edf6599c3f4b07ef74cbd021c42c4124809545b8"},{"author":{"_account_id":9708,"name":"Balazs Gibizer","display_name":"gibi","email":"gibizer@gmail.com","username":"gibi"},"change_message_id":"f0860cc4d1431becff714065a8b70f0a3177bed9","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":3,"id":"605111b2_470d22a5","updated":"2025-09-17 12:28:32.000000000","message":"clean cherry-pick","commit_id":"dfd96286a2380f45cb9b795459fc03719ce10db4"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"1ca8fdcdfd5e0f580a2ff6efa49abf18dc7ed456","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":3,"id":"4452d98d_b64d72ae","in_reply_to":"605111b2_470d22a5","updated":"2025-09-17 14:48:08.000000000","message":"clean cherry pick from stable/2025.1, indeed. LGTM, too.","commit_id":"dfd96286a2380f45cb9b795459fc03719ce10db4"}]}