Re: [pve-devel] [PATCH-SERIES v6 pve-storage/qemu-server/pve-qemu] add external qcow2 snapshot support

[Fiona Ebner <f.ebner@proxmox.com>]

Am 11.06.25 um 23:28 schrieb joao.sousa:
> This is the output of git am when applying the qemu-server patches:
> 
> Applying: blockdev: cmdline: add blockdev syntax support
> .git/rebase-apply/patch:972: trailing whitespace.
> boot:
> error: patch failed: test/cfg2cmd/simple-btrfs.conf.cmd:32
> error: test/cfg2cmd/simple-btrfs.conf.cmd: patch does not apply
> error: patch failed: test/cfg2cmd/simple-rbd.conf.cmd:34
> error: test/cfg2cmd/simple-rbd.conf.cmd: patch does not apply
> error: patch failed: test/cfg2cmd/simple-zfs-over-iscsi.conf.cmd:32
> error: test/cfg2cmd/simple-zfs-over-iscsi.conf.cmd: patch does not apply
> Patch failed at 0001 blockdev: cmdline: add blockdev syntax support
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> 
> It also happens when applying the pve-storage patches. Am I missing something?

The tests in qemu-server were updated since then. You can check out an
earlier commit and apply on top of that. For pve-storage, I'd guess it
was the code style changes, so same story:

https://lore.proxmox.com/pve-devel/241b0a74-ed26-4e01-a187-ed7f755e18fa@proxmox.com/


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel