patches/arch/arm64/xor-neon-...: strip trailing git-format-patch sentinel
The '-- \n2.54.0\n\n' trailer added in989b884was wrong. The underlying problem was the malformed @@ hunk counts (off by 1 in both old and new), fixed ina840f76. 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<version>\n' sentinel — the previous patches' sentinels are fine because they are followed by 'From <sha>' headers that patch(1) recognises as the next patch boundary. Documented in series-dir README as a gotcha.
This commit is contained in:
-3
@@ -34,6 +34,3 @@ index 1234567..2345678 100644
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
lib-$(CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE) += uaccess_flushcache.o
|
lib-$(CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE) += uaccess_flushcache.o
|
||||||
--
|
|
||||||
2.54.0
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user