projects / linux-2.6-block.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dd1d3f8 a0e5ef5)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
authorDavid S. Miller <davem@davemloft.net>
Thu, 24 Jul 2014 04:56:36 +0000 (21:56 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 24 Jul 2014 04:56:36 +0000 (21:56 -0700)
commit11f1fb3459d7b0b36c887dbd930e462f1e011d4d
tree4e9879e010a26c7a2ee7f3a3f35647885aa3b4e0tree | snapshot
parentdd1d3f8f9920926aa426589e542eed6bf58b7354commit | diff
parenta0e5ef53aac8e5049f9344857d8ec5237d31e58bcommit | diff
Merge branch 'master' of git://git./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>
Linux 6.x block layer and io_uring tree(s)