From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Florian Westphal <fw@strlen.de>
Cc: Toby DiPasquale <toby@cbcg.net>,
Patrick McHardy <kaber@trash.net>,
kadlec@blackhole.kfki.hu, davem@davemloft.net,
netfilter-devel@vger.kernel.org, coreteam@netfilter.org,
netdev@vger.kernel.org
Subject: Re: off-by-one in DecodeQ931
Date: Mon, 6 Jun 2016 16:55:10 +0200 [thread overview]
Message-ID: <20160606145510.GB1168@salvia> (raw)
In-Reply-To: <20160606143555.GC7827@breakpoint.cc>
On Mon, Jun 06, 2016 at 04:35:55PM +0200, Florian Westphal wrote:
> Toby DiPasquale <toby@cbcg.net> wrote:
> > Is this latest patch OK?
>
> Yes, I don't know why it wasn't applied yet.
>
> Pablo?
This doesn't apply.
$ git am /tmp/off-by-one-in-DecodeQ931.patch -s
Applying: off-by-one in DecodeQ931
error: patch failed: net/netfilter/nf_conntrack_h323_asn1.c:846
error: net/netfilter/nf_conntrack_h323_asn1.c: patch does not apply
Patch failed at 0001 off-by-one in DecodeQ931
The copy of the patch that failed is found in:
patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Could you resubmit using git-format-patch? Thanks.
next prev parent reply other threads:[~2016-06-06 14:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-23 17:08 [PATCH] off-by-one in DecodeQ931 Toby DiPasquale
2016-04-25 15:29 ` Florian Westphal
2016-05-03 5:12 ` Toby DiPasquale
2016-05-21 0:20 ` Toby DiPasquale
2016-06-06 13:50 ` Toby DiPasquale
2016-06-06 14:35 ` Florian Westphal
2016-06-06 14:55 ` Pablo Neira Ayuso [this message]
2016-06-12 23:29 ` Toby DiPasquale
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160606145510.GB1168@salvia \
--to=pablo@netfilter.org \
--cc=coreteam@netfilter.org \
--cc=davem@davemloft.net \
--cc=fw@strlen.de \
--cc=kaber@trash.net \
--cc=kadlec@blackhole.kfki.hu \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=toby@cbcg.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).