Re: [PATCH 2/3] XFRM: RFC4303 compliant auditing

David Miller
2007-12-21T14:02:41Z

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.