From 84734ba5273922996023d10f51ea4d9a0d9d87f2 Mon Sep 17 00:00:00 2001 From: "Claude (noether)" Date: Mon, 18 May 2026 17:00:11 +0200 Subject: [PATCH] patches/arch/arm64/xor-neon-...: strip trailing git-format-patch sentinel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The '-- \n2.54.0\n\n' trailer added in 989b884 was wrong. The underlying problem was the malformed @@ hunk counts (off by 1 in both old and new), fixed in a840f76. With correct @@ counts, patch(1) processes the hunk fully and then sees the orphan trailer at EOF — which it tries to parse as the start of a new patch header ('malformed patch at line N: 2.54.0'). The original (no-trailer) shape works correctly in the concatenated cumulative as long as the @@ counts are right. Removing the trailer brings the file back to the original 1562-byte size and the cumulative b2sum to 334c37b5d37067982bd9... (size unchanged 157 458 -> 157 446 since the 12 byte trailer is gone). Lesson for ka-promote: when concatenating patches as a stream for patch(1), the LAST patch must not carry a trailing '-- \n\n' sentinel — the previous patches' sentinels are fine because they are followed by 'From ' headers that patch(1) recognises as the next patch boundary. Documented in series-dir README as a gotcha. --- .../0001-arm64-xor-neon-ffixed-x18-build-fix.patch | 3 --- 1 file changed, 3 deletions(-) diff --git a/patches/arch/arm64/xor-neon-ffixed-x18-scs-build-fix-danctnix/0001-arm64-xor-neon-ffixed-x18-build-fix.patch b/patches/arch/arm64/xor-neon-ffixed-x18-scs-build-fix-danctnix/0001-arm64-xor-neon-ffixed-x18-build-fix.patch index 3233904..b23e7b2 100644 --- a/patches/arch/arm64/xor-neon-ffixed-x18-scs-build-fix-danctnix/0001-arm64-xor-neon-ffixed-x18-build-fix.patch +++ b/patches/arch/arm64/xor-neon-ffixed-x18-scs-build-fix-danctnix/0001-arm64-xor-neon-ffixed-x18-build-fix.patch @@ -34,6 +34,3 @@ index 1234567..2345678 100644 endif lib-$(CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE) += uaccess_flushcache.o --- -2.54.0 -