[pbs-devel] applied: [pve-devel] [PATCH v2 pve-qemu 01/11] clean up pve/ patches by merging

[Thomas Lamprecht]

On 03.03.21 10:56, Stefan Reiter wrote:
> No functional change intended.
> 
> Signed-off-by: Stefan Reiter <s.reiter at proxmox.com>
> ---
> 
> Unrelated to rest of series.
> 
>  ...ckup-proxmox-backup-patches-for-qemu.patch | 665 ++++++-------
>  ...estore-new-command-to-restore-from-p.patch |  18 +-
>  ...-coroutines-to-fix-AIO-freeze-cleanu.patch | 914 ------------------
>  ...-support-for-sync-bitmap-mode-never.patch} |   0
>  ...support-for-conditional-and-always-.patch} |   0
>  ...heck-for-bitmap-mode-without-bitmap.patch} |   0
>  ...to-bdrv_dirty_bitmap_merge_internal.patch} |   0
>  ...-iotests-add-test-for-bitmap-mirror.patch} |   0
>  ...0035-mirror-move-some-checks-to-qmp.patch} |   0
>  ...rty-bitmap-tracking-for-incremental.patch} |  80 +-
>  .../pve/0037-PVE-various-PBS-fixes.patch      | 218 +++++
>  ...-driver-to-map-backup-archives-into.patch} |   0
>  ...name-incremental-to-use-dirty-bitmap.patch | 126 ---
>  ...d-query_proxmox_support-QMP-command.patch} |   4 +-
>  .../pve/0039-PVE-fixup-pbs-restore-API.patch  |  44 -
>  ...-add-query-pbs-bitmap-info-QMP-call.patch} |   0
>  ...irty-counter-for-non-incremental-bac.patch |  30 -
>  ...t-stderr-to-journal-when-daemonized.patch} |   0
>  ...use-proxmox_backup_check_incremental.patch |  36 -
>  ...-sequential-job-transaction-support.patch} |  20 +-
>  ...ckup-add-compress-and-encrypt-option.patch | 103 --
>  ...transaction-to-synchronize-job-stat.patch} |   0
>  ...block-on-finishing-and-cleanup-crea.patch} | 245 +++--
>  ...grate-dirty-bitmap-state-via-savevm.patch} |   0
>  ...issing-crypt-and-compress-parameters.patch |  43 -
>  ...rite-callback-with-big-blocks-correc.patch |  76 --
>  ...irty-bitmap-migrate-other-bitmaps-e.patch} |   0
>  ...-block-handling-to-PBS-dump-callback.patch |  85 --
>  ...ll-back-to-open-iscsi-initiatorname.patch} |   0
>  ...outine-QMP-for-backup-cancel_backup.patch} |   0
>  ... => 0049-PBS-add-master-key-support.patch} |   0
>  ...n-up-error-handling-for-create_backu.patch | 187 ----
>  ...-multiple-CREATED-jobs-in-sequential.patch |  39 -
>  debian/patches/series                         |  50 +-
>  34 files changed, 830 insertions(+), 2153 deletions(-)
>  delete mode 100644 debian/patches/pve/0030-PVE-Backup-avoid-coroutines-to-fix-AIO-freeze-cleanu.patch
>  rename debian/patches/pve/{0031-drive-mirror-add-support-for-sync-bitmap-mode-never.patch => 0030-drive-mirror-add-support-for-sync-bitmap-mode-never.patch} (100%)
>  rename debian/patches/pve/{0032-drive-mirror-add-support-for-conditional-and-always-.patch => 0031-drive-mirror-add-support-for-conditional-and-always-.patch} (100%)
>  rename debian/patches/pve/{0033-mirror-add-check-for-bitmap-mode-without-bitmap.patch => 0032-mirror-add-check-for-bitmap-mode-without-bitmap.patch} (100%)
>  rename debian/patches/pve/{0034-mirror-switch-to-bdrv_dirty_bitmap_merge_internal.patch => 0033-mirror-switch-to-bdrv_dirty_bitmap_merge_internal.patch} (100%)
>  rename debian/patches/pve/{0035-iotests-add-test-for-bitmap-mirror.patch => 0034-iotests-add-test-for-bitmap-mirror.patch} (100%)
>  rename debian/patches/pve/{0036-mirror-move-some-checks-to-qmp.patch => 0035-mirror-move-some-checks-to-qmp.patch} (100%)
>  rename debian/patches/pve/{0037-PVE-Backup-Add-dirty-bitmap-tracking-for-incremental.patch => 0036-PVE-Backup-Add-dirty-bitmap-tracking-for-incremental.patch} (88%)
>  create mode 100644 debian/patches/pve/0037-PVE-various-PBS-fixes.patch
>  rename debian/patches/pve/{0043-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch => 0038-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch} (100%)
>  delete mode 100644 debian/patches/pve/0038-PVE-backup-rename-incremental-to-use-dirty-bitmap.patch
>  rename debian/patches/pve/{0044-PVE-add-query_proxmox_support-QMP-command.patch => 0039-PVE-add-query_proxmox_support-QMP-command.patch} (94%)
>  delete mode 100644 debian/patches/pve/0039-PVE-fixup-pbs-restore-API.patch
>  rename debian/patches/pve/{0048-PVE-add-query-pbs-bitmap-info-QMP-call.patch => 0040-PVE-add-query-pbs-bitmap-info-QMP-call.patch} (100%)
>  delete mode 100644 debian/patches/pve/0040-PVE-always-set-dirty-counter-for-non-incremental-bac.patch
>  rename debian/patches/pve/{0049-PVE-redirect-stderr-to-journal-when-daemonized.patch => 0041-PVE-redirect-stderr-to-journal-when-daemonized.patch} (100%)
>  delete mode 100644 debian/patches/pve/0041-PVE-use-proxmox_backup_check_incremental.patch
>  rename debian/patches/pve/{0050-PVE-Add-sequential-job-transaction-support.patch => 0042-PVE-Add-sequential-job-transaction-support.patch} (75%)
>  delete mode 100644 debian/patches/pve/0042-PVE-fixup-pbs-backup-add-compress-and-encrypt-option.patch
>  rename debian/patches/pve/{0051-PVE-Backup-Use-a-transaction-to-synchronize-job-stat.patch => 0043-PVE-Backup-Use-a-transaction-to-synchronize-job-stat.patch} (100%)
>  rename debian/patches/pve/{0052-PVE-Backup-Use-more-coroutines-and-don-t-block-on-fi.patch => 0044-PVE-Backup-Don-t-block-on-finishing-and-cleanup-crea.patch} (63%)
>  rename debian/patches/pve/{0054-PVE-Migrate-dirty-bitmap-state-via-savevm.patch => 0045-PVE-Migrate-dirty-bitmap-state-via-savevm.patch} (100%)
>  delete mode 100644 debian/patches/pve/0045-pbs-fix-missing-crypt-and-compress-parameters.patch
>  delete mode 100644 debian/patches/pve/0046-PVE-handle-PBS-write-callback-with-big-blocks-correc.patch
>  rename debian/patches/pve/{0055-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch => 0046-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch} (100%)
>  delete mode 100644 debian/patches/pve/0047-PVE-add-zero-block-handling-to-PBS-dump-callback.patch
>  rename debian/patches/pve/{0057-PVE-fall-back-to-open-iscsi-initiatorname.patch => 0047-PVE-fall-back-to-open-iscsi-initiatorname.patch} (100%)
>  rename debian/patches/pve/{0058-PVE-Use-coroutine-QMP-for-backup-cancel_backup.patch => 0048-PVE-Use-coroutine-QMP-for-backup-cancel_backup.patch} (100%)
>  rename debian/patches/pve/{0059-PBS-add-master-key-support.patch => 0049-PBS-add-master-key-support.patch} (100%)
>  delete mode 100644 debian/patches/pve/0053-PVE-fix-and-clean-up-error-handling-for-create_backu.patch
>  delete mode 100644 debian/patches/pve/0056-PVE-fix-aborting-multiple-CREATED-jobs-in-sequential.patch
> 
>

applied, thanks!