From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 498271FF170 for <inbox@lore.proxmox.com>; Thu, 12 Jun 2025 10:12:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4A5D217892; Thu, 12 Jun 2025 10:12:23 +0200 (CEST) Message-ID: <80ca1640-087b-4deb-9e30-83623eee1cb8@proxmox.com> Date: Thu, 12 Jun 2025 10:12:16 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: "joao.sousa" <joao.sousa@eurotux.com>, Proxmox VE development discussion <pve-devel@lists.proxmox.com> References: <mailman.197.1748937402.395.pve-devel@lists.proxmox.com> <mailman.283.1749205068.395.pve-devel@lists.proxmox.com> <a9684394-b9a0-4566-81ef-c7b8d44a859e@proxmox.com> <5sqpzsnyzmfvvoco3ilo6tg3pcpomhle7h5dsnmbsbdjobpr5a@rqfsbsas36e2> Content-Language: en-US From: Fiona Ebner <f.ebner@proxmox.com> In-Reply-To: <5sqpzsnyzmfvvoco3ilo6tg3pcpomhle7h5dsnmbsbdjobpr5a@rqfsbsas36e2> X-SPAM-LEVEL: Spam detection results: 0 AWL -0.032 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com] Subject: Re: [pve-devel] [PATCH-SERIES v6 pve-storage/qemu-server/pve-qemu] add external qcow2 snapshot support X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.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