Message ID | 20240805210851.314076-1-kwolf@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 8/6/24 07:08, Kevin Wolf wrote: > The following changes since commit f9851d2ffef59b3a7f39513469263ab3b019480f: > > Merge tag 'migration-20240802-pull-request' ofhttps://gitlab.com/farosas/qemu into staging (2024-08-03 07:26:26 +1000) > > are available in the Git repository at: > > https://repo.or.cz/qemu/kevin.git tags/for-upstream > > for you to fetch changes up to 833362e55d9acc6b7ccc1d80d8cd84688e7f5761: > > iotests/024: exclude 'backing file format' field from the output (2024-08-05 23:00:42 +0200) > > ---------------------------------------------------------------- > Block layer patches > > - scsi-block: Fix error handling with r/werror=stop > - Depend on newer clang for TSA, make WITH_GRAPH_RDLOCK_GUARD() fully > checked, fix block-copy to add missing lock > - vvfat: Fix write bugs for large files and add iotests > - Clean up blockdev-snapshot-internal-sync doc > - Fix iotests 024 for qed Auto-merging qapi/block-core.json CONFLICT (content): Merge conflict in qapi/block-core.json Automatic merge failed; fix conflicts and then commit the result. Please re-spin, thanks. r~