On Tue, Nov 10, 2015 at 07:47:02AM +0800, Feng Gao wrote: > Hi Pablo, > > Signed-off-by: Gao Feng <fgao@xxxxxxxxxx> > --- > include/net/netfilter/nf_conntrack_helper.h | 17 +++++- > net/netfilter/nf_conntrack_ftp.c | 51 ++++++++--------- > net/netfilter/nf_conntrack_helper.c | 35 ++++++++++++ > net/netfilter/nf_conntrack_irc.c | 16 ++---- > net/netfilter/nf_conntrack_sane.c | 50 ++++++++-------- > net/netfilter/nf_conntrack_sip.c | 89 > +++++++++++++++++------------ > net/netfilter/nf_conntrack_tftp.c | 47 +++++++-------- > 7 files changed, 179 insertions(+), 126 deletions(-) > > diff --git a/include/net/netfilter/nf_conntrack_helper.h > b/include/net/netfilter/nf_conntrack_helper.h > index 6cf614bc..0c49c78 100644 > --- a/include/net/netfilter/nf_conntrack_helper.h > +++ b/include/net/netfilter/nf_conntrack_helper.h > @@ -58,7 +58,22 @@ struct nf_conntrack_helper > *__nf_conntrack_helper_find(const char *name, > struct nf_conntrack_helper *nf_conntrack_helper_try_module_get(const char > *name, > u16 l3num, > u8 protonum); I wish I could say "Yes, applied" but I cannot :-( Your MUA keeps mangling your emails, which basically result in unappliable patches. I spent 15 minutes trying to fix this but I couldn't so I'm giving up. Please, resolve this and resubmit. Sorry. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
