[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAML0wpF0--_6kz_zSNrrz7XgWjtJ6JzULgZDKZULfQrghUqYaA@mail.gmail.com>
Date: Sun, 12 Jun 2016 19:29:44 -0400
From: Toby DiPasquale <toby@...g.net>
To: Pablo Neira Ayuso <pablo@...filter.org>
Cc: Florian Westphal <fw@...len.de>, Patrick McHardy <kaber@...sh.net>,
kadlec@...ckhole.kfki.hu, davem@...emloft.net,
netfilter-devel@...r.kernel.org, coreteam@...filter.org,
netdev@...r.kernel.org
Subject: Re: off-by-one in DecodeQ931
Attached is the patch generated with git format-patch.
On Mon, Jun 6, 2016 at 10:55 AM, Pablo Neira Ayuso <pablo@...filter.org> wrote:
> On Mon, Jun 06, 2016 at 04:35:55PM +0200, Florian Westphal wrote:
>> Toby DiPasquale <toby@...g.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.
--
Toby DiPasquale
Download attachment "off-by-one.patch" of type "application/octet-stream" (805 bytes)
Powered by blists - more mailing lists