Re: [PATCH ulogd2 1/2] ulog: remove input plugin

[Florian Westphal <fw@strlen.de>]

Florian Westphal <fw@strlen.de> wrote:
> Corubba Smith <corubba@gmx.de> 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@gmx.de/
> 
> 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.