From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: [PATCH 2/3] XFRM: RFC4303 compliant auditing
Date: Fri, 21 Dec 2007 06:02:41 -0800 (PST)
Message-ID: <20071221.060241.19624191.davem@davemloft.net>
References: <20071221.014310.155404661.davem@davemloft.net>
	<200712210827.24063.paul.moore@hp.com>
	<200712210851.22521.paul.moore@hp.com>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Return-path: <netdev-owner@vger.kernel.org>
In-Reply-To: <200712210851.22521.paul.moore@hp.com>
Sender: netdev-owner@vger.kernel.org
To: paul.moore@hp.com
Cc: netdev@vger.kernel.org, linux-audit@redhat.com, latten@austin.ibm.com
List-Id: linux-audit@redhat.com

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.