)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"aa5fedfc424d24f59fa488a35bbd985f279aa035","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 because change I33b8fc0136b4c1783b5c493e8ca9a15110767f6c (Implement sound model extra spec for libvirt.) is not in Epoxy."},{"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":3,"id":"7bf9d4d9_329fa600","line":19,"updated":"2026-03-23 14:33:50.000000000","message":"✔ thanks for the explanation. this made the review easy :)","commit_id":"0ca00dfa9ae4c95ec7dd8b9fbee4d9a94e6028b4"}],"/PATCHSET_LEVEL":[{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"a87a51985a427fd54b4433302dc15e4aec0cb03f","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"42644f92_730b7ad0","updated":"2026-03-11 00:25:04.000000000","message":"I think you will need to look into issues with your git cherry pick tooling because there is another merge conflict resolution problem in this patch.\n\nFirstly, the way we do backporting is that you need to backport in a \"chain\" model. That is, you cherry pick the master change to stable/2025.2 and resolve merge conflicts, then you cherry pick the stable/2025.2 change to stable/2025.1 and at the bottom of the commit message you should see two \"cherry picked from\" lines, one per branch involved.\n\nThe advantage for doing this is you only deal with merge conflicts once per branch rather than repeating the same resolution over and over again.\n\nSo for this patch, you would `git cherry-pick -x \u003ccommit hash for 2025.2 backport\u003e` and then you would not have the merge conflict for parallel live migrations and instead you would have `NOTE(nicolairuckel): The conflict is because change I33b8fc0136b4c1783b5c493e8ca9a15110767f6c (Implement sound model extra spec for libvirt.) is not in Epoxy.` [1]\n\nHope this makes sense.\n\n[1] https://opendev.org/openstack/nova/commit/dab248718d03c7020b554440087bbdf0f024eba1#diff-66657b03e4ae152974ccc426d0a2932caec7be2d","commit_id":"35e281a855c5d64fba5b1194603fc9eb75b488eb"},{"author":{"_account_id":38350,"name":"Nicolai Ruckel","display_name":"Nicolai Ruckel","email":"nicolai.ruckel@cloudandheat.com","username":"nicolai.ruckel"},"change_message_id":"9f29c78008b95406e7f3f5797c0db51750b893c1","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":1,"id":"50535980_ba2cd869","in_reply_to":"42644f92_730b7ad0","updated":"2026-03-11 07:48:37.000000000","message":"That makes sense, thank you.","commit_id":"35e281a855c5d64fba5b1194603fc9eb75b488eb"},{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"fd78a545a08edc2b29aae7193048347e3bd1a95c","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":2,"id":"165a3dcb_310bb413","updated":"2026-03-11 23:28:46.000000000","message":"I\u0027m guessing you already noticed this but something else went haywire with the latest patchset with .orig and .rej files getting included.\n\nThe two patches below this look OK though.","commit_id":"1e46ca5ac8eec8e4fd0c12ad369ccfe89dcb6667"},{"author":{"_account_id":38350,"name":"Nicolai Ruckel","display_name":"Nicolai Ruckel","email":"nicolai.ruckel@cloudandheat.com","username":"nicolai.ruckel"},"change_message_id":"c4fa0dc51ec172b23dd1e50b36c08dc4d393ea26","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":2,"id":"a9002a75_aca8d26e","in_reply_to":"165a3dcb_310bb413","updated":"2026-03-12 05:23:21.000000000","message":"Oh, sorry. I cleaned that up.","commit_id":"1e46ca5ac8eec8e4fd0c12ad369ccfe89dcb6667"},{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"85280a0449c9454eeb95b82012c16a689e8298b1","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":3,"id":"b7c39fc7_c90be860","updated":"2026-03-26 20:24:47.000000000","message":"Backport from stable/2025.2 to stable/2025.1 fixing an important issue, merge conflict is correctly cited in the commit message, LGTM","commit_id":"0ca00dfa9ae4c95ec7dd8b9fbee4d9a94e6028b4"},{"author":{"_account_id":17685,"name":"Elod Illes","email":"elod.illes@est.tech","username":"elod.illes"},"change_message_id":"aa5fedfc424d24f59fa488a35bbd985f279aa035","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":3,"id":"178dbdd4_495aeda4","updated":"2026-03-23 14:33:50.000000000","message":"backported and merged to stable/2025.2. conflict is noted (thanks!). Cherry pick looks good.","commit_id":"0ca00dfa9ae4c95ec7dd8b9fbee4d9a94e6028b4"}],"nova/virt/libvirt/driver.py":[{"author":{"_account_id":4690,"name":"melanie witt","display_name":"melwitt","email":"melwittt@gmail.com","username":"melwitt"},"change_message_id":"a87a51985a427fd54b4433302dc15e4aec0cb03f","unresolved":true,"context_lines":[{"line_number":271,"context_line":"MIN_VFIO_PCI_VARIANT_LIBVIRT_VERSION \u003d (10, 0, 0)"},{"line_number":272,"context_line":"MIN_VFIO_PCI_VARIANT_QEMU_VERSION \u003d (8, 2, 2)"},{"line_number":273,"context_line":""},{"line_number":274,"context_line":"# Minimum versions supporting the virtio sound model"},{"line_number":275,"context_line":"MIN_VIRTIO_SOUND_LIBVIRT_VERSION \u003d (10, 4, 0)"},{"line_number":276,"context_line":"MIN_VIRTIO_SOUND_QEMU_VERSION \u003d (8, 2, 0)"},{"line_number":277,"context_line":""},{"line_number":278,"context_line":"# Minimum version of Qemu that supports multifd migration with post-copy"},{"line_number":279,"context_line":"MIN_MULTIFD_WITH_POSTCOPY_QEMU_VERSION \u003d (10, 1, 0)"},{"line_number":280,"context_line":""},{"line_number":281,"context_line":"# Minimum version to preserve vTPM data"},{"line_number":282,"context_line":"MIN_VERSION_INT_FOR_KEEP_TPM \u003d (8, 9, 0)"},{"line_number":283,"context_line":""}],"source_content_type":"text/x-python","patch_set":1,"id":"5e83533f_9eabdad3","line":280,"range":{"start_line":274,"start_character":0,"end_line":280,"end_character":0},"updated":"2026-03-11 00:25:04.000000000","message":"These lines should not be in this backport -- this is merge conflict resolution damage.","commit_id":"35e281a855c5d64fba5b1194603fc9eb75b488eb"},{"author":{"_account_id":38350,"name":"Nicolai Ruckel","display_name":"Nicolai Ruckel","email":"nicolai.ruckel@cloudandheat.com","username":"nicolai.ruckel"},"change_message_id":"0f32589fc0e2b7281d0160c9a0ed78aff4ef3a76","unresolved":false,"context_lines":[{"line_number":271,"context_line":"MIN_VFIO_PCI_VARIANT_LIBVIRT_VERSION \u003d (10, 0, 0)"},{"line_number":272,"context_line":"MIN_VFIO_PCI_VARIANT_QEMU_VERSION \u003d (8, 2, 2)"},{"line_number":273,"context_line":""},{"line_number":274,"context_line":"# Minimum versions supporting the virtio sound model"},{"line_number":275,"context_line":"MIN_VIRTIO_SOUND_LIBVIRT_VERSION \u003d (10, 4, 0)"},{"line_number":276,"context_line":"MIN_VIRTIO_SOUND_QEMU_VERSION \u003d (8, 2, 0)"},{"line_number":277,"context_line":""},{"line_number":278,"context_line":"# Minimum version of Qemu that supports multifd migration with post-copy"},{"line_number":279,"context_line":"MIN_MULTIFD_WITH_POSTCOPY_QEMU_VERSION \u003d (10, 1, 0)"},{"line_number":280,"context_line":""},{"line_number":281,"context_line":"# Minimum version to preserve vTPM data"},{"line_number":282,"context_line":"MIN_VERSION_INT_FOR_KEEP_TPM \u003d (8, 9, 0)"},{"line_number":283,"context_line":""}],"source_content_type":"text/x-python","patch_set":1,"id":"3bf25014_8dd6ab22","line":280,"range":{"start_line":274,"start_character":0,"end_line":280,"end_character":0},"in_reply_to":"5e83533f_9eabdad3","updated":"2026-03-17 13:50:10.000000000","message":"I cherry-picked the patch from 2025.2 instead and now this isn\u0027t a problem anymore.","commit_id":"35e281a855c5d64fba5b1194603fc9eb75b488eb"}]}