From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Duan Jiong <jduan@fiberhome.com>
Cc: The netfilter developer mailinglist <netfilter-devel@vger.kernel.org>
Subject: Re: [PATCH] nfnetlink_log: fix the typo
Date: Sun, 19 Feb 2017 20:58:39 +0100 [thread overview]
Message-ID: <20170219195839.GA6211@salvia> (raw)
This doesn't apply, sorry :(
$ git am /tmp/nfnetlink_log-fix-the-typo.patch -s
Applying: nfnetlink_log: fix the typo
error: patch failed: net/netfilter/nfnetlink_log.c:1
error: net/netfilter/nfnetlink_log.c: patch does not apply
Patch failed at 0001 nfnetlink_log: fix the typo
The copy of the patch that failed is found in:
/.git/rebase-apply/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".
next reply other threads:[~2017-02-19 19:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-19 19:58 Pablo Neira Ayuso [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-02-16 3:12 [PATCH] nfnetlink_log: fix the typo 段炯
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=20170219195839.GA6211@salvia \
--to=pablo@netfilter.org \
--cc=jduan@fiberhome.com \
--cc=netfilter-devel@vger.kernel.org \
/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).