Re: [PATCH] nfnetlink_log: fix the typo

2017-02-19 Thread Pablo Neira Ayuso
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".
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] nfnetlink_log: fix the typo

2017-02-15 Thread 段炯

From 5a4a39fd4373e78b0019b0180718e96c85b1fdd7 Mon Sep 17 00:00:00 2001
From: Duan Jiong <jd...@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 <jd...@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 <lafo...@netfilter.org>
  * (C) 2006-2012 Patrick McHardy <ka...@trash.net>
--
2.7.4


--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html