* Re: [PATCH] nfnetlink_log: fix the typo
@ 2017-02-19 19:58 Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2017-02-19 19:58 UTC (permalink / raw)
To: Duan Jiong; +Cc: The netfilter developer mailinglist
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".
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH] nfnetlink_log: fix the typo
@ 2017-02-16 3:12 段炯
0 siblings, 0 replies; 2+ messages in thread
From: 段炯 @ 2017-02-16 3:12 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: netfilter-devel
From 5a4a39fd4373e78b0019b0180718e96c85b1fdd7 Mon Sep 17 00:00:00 2001
From: Duan Jiong <jduan@fiberhome.com>
Date: Thu, 16 Feb 2017 11:07:38 +0800
Subject: [PATCH] nfnetlink_log: fix the typo
s/nfetlink/nfnetlink/
Signed-off-by: Duan Jiong <jduan@fiberhome.com>
---
net/netfilter/nfnetlink_log.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 08247bf..b8ff558 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -1,6 +1,6 @@
/*
* This is a module which is used for logging packets to userspace via
- * nfetlink.
+ * nfnetlink.
*
* (C) 2005 by Harald Welte <laforge@netfilter.org>
* (C) 2006-2012 Patrick McHardy <kaber@trash.net>
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-02-19 19:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-19 19:58 [PATCH] nfnetlink_log: fix the typo Pablo Neira Ayuso
-- strict thread matches above, loose matches on Subject: below --
2017-02-16 3:12 段炯
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.