From: YOSHIFUJI Hideaki <redacted>
Date: Thu, 24 Aug 2006 00:02:01 +0900

we have another discussion about improvement of XFRM state hash.
Our patches (about source address list part) will conflict with that
work, but we did not take that into account so far because it was not
in the tree.

Yes, do not worry about this.  I will add my changes later
after we integrate the mobile-ipv6 work, and therefore I will
take care of the conflicts.