From: Fiona Ebner <f.ebner@proxmox.com>
To: "joao.sousa" <joao.sousa@eurotux.com>,
Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [PATCH-SERIES v6 pve-storage/qemu-server/pve-qemu] add external qcow2 snapshot support
Date: Thu, 12 Jun 2025 10:12:16 +0200 [thread overview]
Message-ID: <80ca1640-087b-4deb-9e30-83623eee1cb8@proxmox.com> (raw)
In-Reply-To: <5sqpzsnyzmfvvoco3ilo6tg3pcpomhle7h5dsnmbsbdjobpr5a@rqfsbsas36e2>
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
next prev parent reply other threads:[~2025-06-12 8:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-03 7:55 Alexandre Derumier via pve-devel
2025-06-05 13:53 ` Fiona Ebner
2025-06-05 14:08 ` DERUMIER, Alexandre via pve-devel
[not found] ` <0aa862ab988ff9df50f4637f3712f137f23c34c2.camel@groupe-cyllene.com>
2025-06-05 14:19 ` Fiona Ebner
2025-06-06 10:17 ` joao.sousa via pve-devel
2025-06-10 8:54 ` Fiona Ebner
2025-06-11 21:28 ` joao.sousa via pve-devel
[not found] ` <5sqpzsnyzmfvvoco3ilo6tg3pcpomhle7h5dsnmbsbdjobpr5a@rqfsbsas36e2>
2025-06-12 7:02 ` DERUMIER, Alexandre via pve-devel
2025-06-12 8:12 ` Fiona Ebner [this message]
2025-06-13 10:25 ` joao.sousa via pve-devel
[not found] ` <zwkygc6va6jmieho2h7gqsx4idrgrxvd7et2kfbi3vyddhjk7c@kfiwufb7auvv>
2025-06-16 8:34 ` Fiona Ebner
[not found] ` <8cbed06bbe3db00e96670dec1e240123b946a917.camel@groupe-cyllene.com>
2025-06-12 11:33 ` DERUMIER, Alexandre via pve-devel
[not found] ` <a7185aa585b414710be6e09729adda57ed3787b8.camel@groupe-cyllene.com>
2025-06-13 16:42 ` joao.sousa--- via pve-devel
[not found] ` <qss36oltvd4gz5tiss7dqono5h2zmsgwmodj4cqkroboizypwj@kbyz3mymh75a>
2025-06-16 5:50 ` DERUMIER, Alexandre via pve-devel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=80ca1640-087b-4deb-9e30-83623eee1cb8@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=joao.sousa@eurotux.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal