[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20071221.060241.19624191.davem@davemloft.net>
Date: Fri, 21 Dec 2007 06:02:41 -0800 (PST)
From: David Miller <davem@...emloft.net>
To: paul.moore@...com
Cc: netdev@...r.kernel.org, linux-audit@...hat.com,
latten@...tin.ibm.com
Subject: Re: [PATCH 2/3] XFRM: RFC4303 compliant auditing
From: Paul Moore <paul.moore@...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.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists