| commit | 11f1fb3459d7b0b36c887dbd930e462f1e011d4d | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Jul 23 21:56:36 2014 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Wed Jul 23 21:56:36 2014 -0700 |
| tree | 4e9879e010a26c7a2ee7f3a3f35647885aa3b4e0 | |
| parent | dd1d3f8f9920926aa426589e542eed6bf58b7354 [diff] | |
| parent | a0e5ef53aac8e5049f9344857d8ec5237d31e58b [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec Steffen Klassert says: ==================== pull request (net): ipsec 2014-07-23 Just two fixes this time, both are stable candidates. 1) Fix the dst_entry refcount on socket policy usage. 2) Fix a wrong SPI check that prevents AH SAs from getting installed, dependent on the SPI. From Tobias Brunner. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>