From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Quentin Aebischer <Quentin.Aebischer@USherbrooke.ca>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [PATCH] conntrackd: basic TIPC implementation for NOTRACK mode
Date: Fri, 10 Feb 2012 11:26:53 +0100 [thread overview]
Message-ID: <20120210102653.GA9617@1984> (raw)
In-Reply-To: <20120126211344.33964cmak17akti0@www.usherbrooke.ca>
Hi Quentin,
On Thu, Jan 26, 2012 at 09:13:44PM -0500, Quentin Aebischer wrote:
> Ok, time for an other try !
I'm trying to apply this patch but it seems you mail client has
mangled the patch.
$ patch -p1 < tipc.patch
patching file include/Makefile.am
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file
include/Makefile.am.rej
patching file include/channel.h
Hunk #1 FAILED at 4.
Hunk #2 FAILED at 13.
Hunk #3 FAILED at 31.
Hunk #4 FAILED at 41.
Hunk #5 FAILED at 97.
If I display the file it shows:
diff --git a/include/channel.h b/include/channel.h
index 9b5fad8..704d384 100644
--- a/include/channel.h
+++ b/include/channel.h
@@ -4,6 +4,7 @@
#include "mcast.h"
#include "udp.h"
#include "tcp.h"
+#include "tipc.h"
Note the strange extra space.
Can you resend it to me, please? I'd like to apply them to
git.netfilter.org. Thanks.
next prev parent reply other threads:[~2012-02-10 10:26 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-21 13:52 [PATCH] conntrackd: basic TIPC implementation for NOTRACK mode Quentin Aebischer
2012-01-22 17:41 ` Pablo Neira Ayuso
2012-01-22 21:27 ` Quentin Aebischer
2012-01-23 10:07 ` Pablo Neira Ayuso
2012-01-23 18:25 ` Quentin Aebischer
2012-01-24 1:01 ` Pablo Neira Ayuso
2012-01-24 17:00 ` Quentin Aebischer
2012-01-26 0:19 ` Pablo Neira Ayuso
2012-01-27 2:13 ` Quentin Aebischer
2012-01-27 2:46 ` Quentin Aebischer
2012-02-08 0:42 ` Pablo Neira Ayuso
2012-02-09 20:44 ` Quentin Aebischer
2012-02-08 0:43 ` Pablo Neira Ayuso
2012-02-09 20:45 ` Quentin Aebischer
2012-02-10 10:26 ` Pablo Neira Ayuso [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-01-21 2:27 Quentin Aebischer
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=20120210102653.GA9617@1984 \
--to=pablo@netfilter.org \
--cc=Quentin.Aebischer@USherbrooke.ca \
--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 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.