On 3/29/25 15:00, Florian Westphal wrote:
> Florian Westphal <fw@xxxxxxxxx> wrote:
>> Corubba Smith <corubba@xxxxxx> wrote:
>>> The ULOG target was removed from the linux kernel with 7200135bc1e6
>>> ("netfilter: kill ulog targets") aka v3.17, so remove the input plugin
>>> for it. It's successor NFLOG should be used instead, which has its own
>>> input plugin.
>>
>> Your email client is reformattig parts of the diff:
>> % git am ~/Downloads/ulogd2-1-2-ulog-remove-input-plugin.patch
>> Applying: ulog: remove input plugin
>> error: patch failed: doc/ulogd.sgml:132
>> error: doc/ulogd.sgml: patch does not apply
>> Patch failed at 0001 ulog: remove input plugin
>> hint: Use 'git am --show-current-patch=diff' to see the failed patch
>
> I resolved the conflicts locally and applied the patches, please
> double check that I did not miss anything.
>
>> https://patchwork.ozlabs.org/project/netfilter-devel/patch/23db0352-9525-427b-a936-c8ef87e4d5b7@xxxxxx/
>>
>> Can you send the pach to yourself and make sure "git am" can apply it
>> again?
>
> FWIW, it looks like something in the delivery path removes trailing
> spaces, turning "some line \n" into "some line\n" which will make git-am
> fail as intree and diff don't match.
>
It appears that my mail provider *sometimes* converts to a different
Content-Transfer-Encoding, and in the process removes trailing
whitespace. Apologies for that, and thank you for the feedback as well
as resolving it on your end. I will look into preventing that from
happening again.
`git diff HEAD..origin/master` shows no difference between my original
local branch and the updated remote branch, so from my point of view
the patchset was applied as intended and there's nothing missing or
extra.
