From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mav.lukeshu.com (mav.lukeshu.com [104.207.138.63]) by sourceware.org (Postfix) with ESMTPS id 68D063858C39; Sat, 8 Jun 2024 00:35:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 68D063858C39 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=lukeshu.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=lukeshu.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 68D063858C39 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=104.207.138.63 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717806931; cv=none; b=rE9mD8cQjkpITWwkECSPs9w4HUXwUjPCxS+AG9lFDAG0q1BxQCABDwzpcAvcqTDoHVwkVLs/KAuJ89lSpRoMYTbLVdXQ/LxBVltrPHlP+esBDoAEmivBzjV0mEd9OVC1JgvDDSng0IDcnt/0Zn33YbViquZoaGfVadRIgHrcf94= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717806931; c=relaxed/simple; bh=WV1qn1NINeXOo64AB/w3hjXgIMF6aBigDZs2qBfFYxs=; h=Date:Message-ID:From:To:Subject:MIME-Version; b=EV/4OJUayfWZl9xkMR7eQuWrEDG7HmaSxZ4lo/2G1+WrBoaEhp8NT8z/dq5uE3CH5KJ3nNX3UTDQjhktiKIpxmN2HDv+mq09lC82tNwGxqHgjlx9jXvYeUfFZ694UfMThUbI889g4+dOvIop5BF8OLjBRxiyaSxWLq5e5s8JLjQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from lukeshu-thinkpad-e15 (unknown [IPv6:2601:280:5e01:2a5d:aee0:10ff:fe55:8023]) by mav.lukeshu.com (Postfix) with ESMTPSA id C2ED58067C; Fri, 7 Jun 2024 20:35:28 -0400 (EDT) Date: Fri, 07 Jun 2024 18:35:28 -0600 Message-ID: <878qzge0fj.wl-lukeshu@lukeshu.com> From: Luke T. Shumaker To: binutils@sourceware.org, gdb-patches@sourceware.org Cc: "Alfred M. Szmidt" , "Ralf Wildenhues" , "Tom Tromey" , "Luke T. Shumaker" Subject: Re: [PATCH 3/4] zlib: Remove files that should certainly not be checked in In-Reply-To: <20240606201145.1747021-4-lukeshu@lukeshu.com> References: <20240606201145.1747021-1-lukeshu@lukeshu.com> <20240606201145.1747021-4-lukeshu@lukeshu.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/29.3 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Thu, 06 Jun 2024 14:11:36 -0600, Luke T. Shumaker wrote: > diff --git a/zlib/contrib/masmx64/gvmat64.obj b/zlib/contrib/masmx64/gvmat64.obj > deleted file mode 100644 > index a49ca029c63e24f907d7cd5d6eaa25f016c9aea5..0000000000000000000000000000000000000000 > GIT binary patch > literal 0 > HcmV?d00001 > > literal 4119 > zcma*qeRNah9l-Hl+gQ3}CE>k*%H@!u&{Eq{OKC-E36g5cL57oQHb_Z|(WdE=w1AW2 patchwork seems to be choking on this. https://patchwork.sourceware.org/project/binutils/patch/20240606201145.1747021-4-lukeshu@lukeshu.com/ -> https://ci.linaro.org/job/tcwg_binutils_build--master-arm-precommit/1996/artifact/artifacts/jenkins/pw-apply.log : + git -C binutils pw series apply 34807 Failed to apply patch: Applying: readline: Fix examples/rlfe/configure.ac Applying: Update COPYING files from gnu.org Applying: zlib: Remove files that should certainly not be checked in error: git apply: bad git-diff - expected /dev/null, got zlib/contrib/masmx86/inffas32.obj on line 374 error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0003 zlib: Remove files that should certainly not be checked in 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". And indeed, when I hit the patchwork API to get https://patchwork.sourceware.org/series/34807/mbox/ (which is the file it's passing to `git am`) I see that the patch has been mangled. I wonder if passing `--irreversible-delete` to `git format-patch` would produce something that patchwork would be happy with? -- Happy hacking, ~ Luke T. Shumaker