• David S. Miller's avatar
    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next · 77c7a7b3
    David S. Miller authored
    Steffen Klassert says:
    
    ====================
    pull request (net-next): ipsec-next 2018-12-18
    
    1) Add xfrm policy selftest scripts.
       From Florian Westphal.
    
    2) Split inexact policies into four different search list
       classes and use the rbtree infrastructure to store/lookup
       the policies. This is to improve the policy lookup
       performance after the flowcache removal.
       Patches from Florian Westphal.
    
    3) Various coding style fixes, from Colin Ian King.
    
    4) Fix policy lookup logic after adding the inexact policy
       search tree infrastructure. From Florian Westphal.
    
    5) Remove a useless remove BUG_ON from xfrm6_dst_ifdown.
       From Li RongQing.
    
    6) Use the correct policy direction for lookups on hash
       rebuilding. From Florian Westphal.
    
    Please pull or let me know if there are problems.
    ====================
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    77c7a7b3
Makefile 1.04 KB