From: Paul Moore <paul.moore@hp.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, linux-audit@redhat.com
Subject: Re: [PATCH 2/3] XFRM: RFC4303 compliant auditing
Date: Fri, 21 Dec 2007 09:22:23 -0500 [thread overview]
Message-ID: <200712210922.23386.paul.moore@hp.com> (raw)
In-Reply-To: <20071221.060241.19624191.davem@davemloft.net>
On Friday 21 December 2007 9:02:41 am David Miller wrote:
> From: Paul Moore <paul.moore@hp.com>
> Date: Fri, 21 Dec 2007 08:51:22 -0500
>
> > Ah, looks like I may not be crazy after all! It looks like the XFRM
> > patches from Masahide NAKAMURA were pulled into net-2.6.25 just before
> > mine last night which caused my patches to conflict ...
>
> Sorry. I had double checked and was going to rework your patches
> by hand if that was the case, but for some reason I didn't see
> his patches as being the culprit causing the rejects when I
> checked things out.
>
> I must have looked over the history correctly.
No harm, no foul. I've just about finished respining the patches, expect them
shortly ...
--
paul moore
linux security @ hp
next prev parent reply other threads:[~2007-12-21 14:22 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-20 21:42 [PATCH 0/3] XFRM audit fixes/additions for net-2.6.25 Paul Moore
2007-12-20 21:42 ` [PATCH 1/3] XFRM: Assorted IPsec fixups Paul Moore
2007-12-20 22:25 ` James Morris
2007-12-21 4:49 ` David Miller
2007-12-20 21:42 ` [PATCH 2/3] XFRM: RFC4303 compliant auditing Paul Moore
2007-12-20 22:27 ` James Morris
2007-12-21 9:43 ` David Miller
2007-12-21 13:27 ` Paul Moore
2007-12-21 13:51 ` Paul Moore
2007-12-21 14:02 ` David Miller
2007-12-21 14:22 ` Paul Moore [this message]
2007-12-20 21:42 ` [PATCH 3/3] XFRM: Drop packets when replay counter would overflow Paul Moore
2007-12-20 22:28 ` James Morris
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=200712210922.23386.paul.moore@hp.com \
--to=paul.moore@hp.com \
--cc=davem@davemloft.net \
--cc=linux-audit@redhat.com \
--cc=netdev@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).