)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":11604,"name":"sean mooney","email":"smooney@redhat.com","username":"sean-k-mooney"},"change_message_id":"a74ea93cffe57a66dc41b26a70fb3a7c984b78cd","unresolved":true,"context_lines":[{"line_number":25,"context_line":"    in nova/virt/libvirt/driver.py"},{"line_number":26,"context_line":""},{"line_number":27,"context_line":"    650772d97efe98e578c18b8268b3bbed63ac4d18"},{"line_number":28,"context_line":"    in nova/tests/functional/libvirt/test_vtpm.py"},{"line_number":29,"context_line":""},{"line_number":30,"context_line":"Signed-Off-By: jonas.schaefer@cloudandheat.com"},{"line_number":31,"context_line":"Change-Id: Iefb879428681003d6db604b70353a91913c92461"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":4,"id":"ab60a15d_6f8c0f21","line":28,"updated":"2026-03-05 17:44:02.000000000","message":"you shoudlnot be inlcuding some of the changes for this you shoudl be backporting that first\n\nhttps://opendev.org/openstack/nova/commit/650772d97efe98e578c18b8268b3bbed63ac4d18\nis the Add functional reproducer for bug 2125030\n\nand the fix https://review.opendev.org/c/openstack/nova/+/962007 shoudl be backported first","commit_id":"35482b8f7cc06e59b6ca238495e523e9a5d8b53d"},{"author":{"_account_id":38350,"name":"Nicolai Ruckel","display_name":"Nicolai Ruckel","email":"nicolai.ruckel@cloudandheat.com","username":"nicolai.ruckel"},"change_message_id":"4b364fb3c8c2def3345d97bb93d474f5e2bad57b","unresolved":true,"context_lines":[{"line_number":25,"context_line":"    in nova/virt/libvirt/driver.py"},{"line_number":26,"context_line":""},{"line_number":27,"context_line":"    650772d97efe98e578c18b8268b3bbed63ac4d18"},{"line_number":28,"context_line":"    in nova/tests/functional/libvirt/test_vtpm.py"},{"line_number":29,"context_line":""},{"line_number":30,"context_line":"Signed-Off-By: jonas.schaefer@cloudandheat.com"},{"line_number":31,"context_line":"Change-Id: Iefb879428681003d6db604b70353a91913c92461"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":4,"id":"ed22f38b_f4acacb8","line":28,"in_reply_to":"ab60a15d_6f8c0f21","updated":"2026-03-05 18:41:22.000000000","message":"Okay. The first one is here: https://review.opendev.org/c/openstack/nova/+/979041\n\nI\u0027ll do the next one once this is merged.","commit_id":"35482b8f7cc06e59b6ca238495e523e9a5d8b53d"},{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"b571adc6cfd53023edd3d7ab46a760fae97f738c","unresolved":true,"context_lines":[{"line_number":12,"context_line":""},{"line_number":13,"context_line":"This is very surprising to users who store persistent data in the TPM,"},{"line_number":14,"context_line":"such as keys required to decrypt the main disk of the VM."},{"line_number":15,"context_line":""},{"line_number":16,"context_line":"Closes-Bug: #2118888"},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"Signed-Off-By: jonas.schaefer@cloudandheat.com"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":6,"id":"048f6107_9ae72227","line":15,"updated":"2026-03-05 19:37:17.000000000","message":"Because this patch is not a clean cherry pick, we prefer to show the list of `Conflicts:` and a short note about why:\n\nhttps://docs.openstack.org/project-team-guide/stable-branches.html#conflicts\n\nAfter you resolve the conflict and do `git add` and `git cherry-pick --continue` you should be prompted by git to edit the commit message. There should be commented out lines in it that says for example:\n\n```\nPreserve vTPM state between power off and power on\n\nWithout this patch, due to power_on calling _hard_reboot, which in turn\nundefines the VM to ensure a clean domain XML, the TPM data is erased by\nlibvirt.\n\nThis is very surprising to users who store persistent data in the TPM,\nsuch as keys required to decrypt the main disk of the VM. \n\nCloses-Bug: #2118888\n\nSigned-Off-By: jonas.schaefer@cloudandheat.com\nChange-Id: Iefb879428681003d6db604b70353a91913c92461\n\n# Conflicts:\n#       nova/virt/libvirt/driver.py\n```\n\nYou will want to uncomment those lines and cut/paste them into position just under the original commit message. Then add a note for the reason [1]:\n\n```\nConflicts:\n      nova/virt/libvirt/driver.py\n      \nNOTE(nicolairuckel): The conflict is due to change I98ff5f07f94d94f3aa0227591f425d532773adb0 (Allow to perform parallel live migrations) which is not in Flamingo.\n```\n\nand then save the commit message as normal.\n\n[1] https://opendev.org/openstack/nova/commit/25fbf32f22c7f1a8082269782034bf9477e96e48#diff-66657b03e4ae152974ccc426d0a2932caec7be2d","commit_id":"a52b2c07431243d0f9613e9f3e5bc52c7a46a359"},{"author":{"_account_id":38350,"name":"Nicolai Ruckel","display_name":"Nicolai Ruckel","email":"nicolai.ruckel@cloudandheat.com","username":"nicolai.ruckel"},"change_message_id":"573b12554a392640584bf5f1a4b11ab5b304297d","unresolved":false,"context_lines":[{"line_number":12,"context_line":""},{"line_number":13,"context_line":"This is very surprising to users who store persistent data in the TPM,"},{"line_number":14,"context_line":"such as keys required to decrypt the main disk of the VM."},{"line_number":15,"context_line":""},{"line_number":16,"context_line":"Closes-Bug: #2118888"},{"line_number":17,"context_line":""},{"line_number":18,"context_line":"Signed-Off-By: jonas.schaefer@cloudandheat.com"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":6,"id":"2800aeba_98cc0b76","line":15,"in_reply_to":"048f6107_9ae72227","updated":"2026-03-05 19:43:23.000000000","message":"Done","commit_id":"a52b2c07431243d0f9613e9f3e5bc52c7a46a359"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"096da3f47a2287811b70b4504965080f321acfe3","unresolved":false,"context_lines":[{"line_number":16,"context_line":"Conflicts:"},{"line_number":17,"context_line":"      nova/virt/libvirt/driver.py"},{"line_number":18,"context_line":""},{"line_number":19,"context_line":"NOTE(nicolairuckel): The conflict is due to change I98ff5f07f94d94f3aa0227591f425d532773adb0 (Allow to perform parallel live migrations) which is not in Flamingo."},{"line_number":20,"context_line":""},{"line_number":21,"context_line":"Closes-Bug: #2118888"},{"line_number":22,"context_line":""}],"source_content_type":"text/x-gerrit-commit-message","patch_set":7,"id":"b8f8bd64_1ca93ae2","line":19,"updated":"2026-03-10 10:21:01.000000000","message":"✔ yepp. this is the cause of the conflict. and that is not a bug fix but part of a new feature, that we don\u0027t allow to backport.\nthanks for the explanation!","commit_id":"687f2db6c6352040d49f3d31781ef8d186e0351a"}],"/PATCHSET_LEVEL":[{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"b571adc6cfd53023edd3d7ab46a760fae97f738c","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":6,"id":"e08a77d2_77a2dc3a","updated":"2026-03-05 19:37:17.000000000","message":"Manual merge conflict needs to be resolved and noted in the commit message.","commit_id":"a52b2c07431243d0f9613e9f3e5bc52c7a46a359"},{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"8cdd5a5ffde71aa3fd01ca12bd9d4ba43b2fde1f","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":7,"id":"e3e55b09_c1d322a4","updated":"2026-03-11 00:28:06.000000000","message":"+1 what elodilles said, valid for stable branch and merge conflict correctly resolved and cited in the commit message, LGTM","commit_id":"687f2db6c6352040d49f3d31781ef8d186e0351a"},{"author":{"_account_id":38350,"name":"Nicolai Ruckel","display_name":"Nicolai Ruckel","email":"nicolai.ruckel@cloudandheat.com","username":"nicolai.ruckel"},"change_message_id":"5991eaee9e6c5a1089e3ed2463e795fa3f80d187","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":7,"id":"c1bf0cce_59c14c04","updated":"2026-03-12 08:43:24.000000000","message":"recheck - all dependencies are merged now","commit_id":"687f2db6c6352040d49f3d31781ef8d186e0351a"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"c7d5e39646ab8f805fc3d200080cc33ca3e9c5a1","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":7,"id":"a0beb887_ba90dc6e","updated":"2026-03-16 12:52:31.000000000","message":"recheck - grenade-skip-level failed [1], but it passed on another patch and the error looks unrelated\n\n[1]\n\n    File \"/opt/stack/old/tempest/tempest/lib/common/rest_client.py\", line 892, in _error_checker\n      raise exceptions.Conflict(resp_body, resp\u003dresp)\n    tempest.lib.exceptions.Conflict: Conflict with state of target resource\n    Details: {\u0027type\u0027: \u0027SecurityGroupInUse\u0027, \u0027message\u0027: \u0027Security Group None cannot perform precommit_delete due to Callback neutron.plugins.ml2.drivers.ovn.mech_driver.mech_driver.OVNMechanismDriver._delete_security_group_precommit-7985131 failed with \"pg_12e78759_4176_488b_abd4_e789f3751e85 does not exist in name of Port_Group\".\u0027, \u0027detail\u0027: \u0027\u0027}\n    ERROR: InvocationError for command /opt/stack/old/tempest/.tox/venv/bin/tempest verify-config -uro /tmp/tmp.Uj3dh1fvEj (exited with code 1)","commit_id":"687f2db6c6352040d49f3d31781ef8d186e0351a"},{"author":{"_account_id":38350,"name":"Nicolai Ruckel","display_name":"Nicolai Ruckel","email":"nicolai.ruckel@cloudandheat.com","username":"nicolai.ruckel"},"change_message_id":"255aaa7075d9d8b2c9a1f0f30ef3adb1260ac0e3","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":7,"id":"193d4556_12340260","updated":"2026-03-13 09:42:39.000000000","message":"recheck - unrelated CI issue, the job was successful earlier","commit_id":"687f2db6c6352040d49f3d31781ef8d186e0351a"},{"author":{"_account_id":38350,"name":"Nicolai Ruckel","display_name":"Nicolai Ruckel","email":"nicolai.ruckel@cloudandheat.com","username":"nicolai.ruckel"},"change_message_id":"feafe24cda7964ae2b3ec68f56d9ba30444d8d8b","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":7,"id":"e52590bd_4c55a6d6","updated":"2026-03-12 15:45:07.000000000","message":"recheck - unrelated CI issue, the job was successful earlier","commit_id":"687f2db6c6352040d49f3d31781ef8d186e0351a"},{"author":{"_account_id":38350,"name":"Nicolai Ruckel","display_name":"Nicolai Ruckel","email":"nicolai.ruckel@cloudandheat.com","username":"nicolai.ruckel"},"change_message_id":"c6d8dc518262e5df95262d84cfc6b982a8a9f4c3","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":7,"id":"cd379090_6b2deb57","updated":"2026-03-09 17:05:52.000000000","message":"recheck because of CI bug","commit_id":"687f2db6c6352040d49f3d31781ef8d186e0351a"},{"author":{"_account_id":38350,"name":"Nicolai Ruckel","display_name":"Nicolai Ruckel","email":"nicolai.ruckel@cloudandheat.com","username":"nicolai.ruckel"},"change_message_id":"6dd5e2f5085d3107eaaf68c69670e9e36e568289","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":7,"id":"7ddb16f9_69005aab","updated":"2026-03-06 09:28:56.000000000","message":"recheck because of unrelated Cinder issue","commit_id":"687f2db6c6352040d49f3d31781ef8d186e0351a"},{"author":{"_account_id":13252,"name":"Dr. Jens Harbott","display_name":"Jens Harbott (frickler)","email":"frickler@offenerstapel.de","username":"jrosenboom"},"change_message_id":"f37ac66d1d488d142ac5d440ec007f0d68d629fc","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":7,"id":"dbc9101f_9e38d8c9","updated":"2026-03-06 13:06:19.000000000","message":"recheck tox pinned","commit_id":"687f2db6c6352040d49f3d31781ef8d186e0351a"},{"author":{"_account_id":38350,"name":"Nicolai Ruckel","display_name":"Nicolai Ruckel","email":"nicolai.ruckel@cloudandheat.com","username":"nicolai.ruckel"},"change_message_id":"242867c4e27db5284270c16f3565ce57e98737ac","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":7,"id":"33c4e0dc_956d227e","updated":"2026-03-12 11:34:19.000000000","message":"recheck unrelated tempest error","commit_id":"687f2db6c6352040d49f3d31781ef8d186e0351a"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"096da3f47a2287811b70b4504965080f321acfe3","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":7,"id":"8f8f73d6_9ed03793","updated":"2026-03-10 10:21:01.000000000","message":"this looks valid to backport. cherry pick looks good: conflict is noted. original patch merged on master. LGTM. Thanks Nicolai!","commit_id":"687f2db6c6352040d49f3d31781ef8d186e0351a"},{"author":{"_account_id":38350,"name":"Nicolai Ruckel","display_name":"Nicolai Ruckel","email":"nicolai.ruckel@cloudandheat.com","username":"nicolai.ruckel"},"change_message_id":"700de12ec5a256fae59602550fc306de40cfa73d","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":7,"id":"de0ef984_aaf6f600","in_reply_to":"cd379090_6b2deb57","updated":"2026-03-09 17:06:45.000000000","message":"context: https://review.opendev.org/c/zuul/zuul-jobs/+/979136","commit_id":"687f2db6c6352040d49f3d31781ef8d186e0351a"}],"nova/virt/libvirt/driver.py":[{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"b571adc6cfd53023edd3d7ab46a760fae97f738c","unresolved":true,"context_lines":[{"line_number":262,"context_line":"MIN_VIRTIO_SOUND_LIBVIRT_VERSION \u003d (10, 4, 0)"},{"line_number":263,"context_line":"MIN_VIRTIO_SOUND_QEMU_VERSION \u003d (8, 2, 0)"},{"line_number":264,"context_line":""},{"line_number":265,"context_line":"# Minimum version of Qemu that supports multifd migration with post-copy"},{"line_number":266,"context_line":"MIN_MULTIFD_WITH_POSTCOPY_QEMU_VERSION \u003d (10, 1, 0)"},{"line_number":267,"context_line":""},{"line_number":268,"context_line":"# Minimum version to preserve vTPM data"},{"line_number":269,"context_line":"MIN_VERSION_INT_FOR_KEEP_TPM \u003d (8, 9, 0)"}],"source_content_type":"text/x-python","patch_set":6,"id":"7cc6203f_74d6725c","line":266,"range":{"start_line":265,"start_character":0,"end_line":266,"end_character":51},"updated":"2026-03-05 19:37:17.000000000","message":"This should not be in this backport -- this is from a merge conflict.","commit_id":"a52b2c07431243d0f9613e9f3e5bc52c7a46a359"},{"author":{"_account_id":38350,"name":"Nicolai Ruckel","display_name":"Nicolai Ruckel","email":"nicolai.ruckel@cloudandheat.com","username":"nicolai.ruckel"},"change_message_id":"573b12554a392640584bf5f1a4b11ab5b304297d","unresolved":false,"context_lines":[{"line_number":262,"context_line":"MIN_VIRTIO_SOUND_LIBVIRT_VERSION \u003d (10, 4, 0)"},{"line_number":263,"context_line":"MIN_VIRTIO_SOUND_QEMU_VERSION \u003d (8, 2, 0)"},{"line_number":264,"context_line":""},{"line_number":265,"context_line":"# Minimum version of Qemu that supports multifd migration with post-copy"},{"line_number":266,"context_line":"MIN_MULTIFD_WITH_POSTCOPY_QEMU_VERSION \u003d (10, 1, 0)"},{"line_number":267,"context_line":""},{"line_number":268,"context_line":"# Minimum version to preserve vTPM data"},{"line_number":269,"context_line":"MIN_VERSION_INT_FOR_KEEP_TPM \u003d (8, 9, 0)"}],"source_content_type":"text/x-python","patch_set":6,"id":"7f723ec0_e9b99418","line":266,"range":{"start_line":265,"start_character":0,"end_line":266,"end_character":51},"in_reply_to":"7cc6203f_74d6725c","updated":"2026-03-05 19:43:23.000000000","message":"Done","commit_id":"a52b2c07431243d0f9613e9f3e5bc52c7a46a359"}]}
