]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
authorDavid S. Miller <davem@davemloft.net>
Fri, 28 Apr 2017 19:43:24 +0000 (15:43 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 28 Apr 2017 19:43:24 +0000 (15:43 -0400)
commitcd5487fb9485934dfa0ad9d6b52c4da8e38318e6
tree9effb1cffdea1f8d6ec276550a398e36a2153ac8
parentcec381919818a9a0cb85600b3c82404bdd38cf36
parente892d2d40445a14a19530a2be8c489b87bcd7c19
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2017-04-28

Just one patch to fix a misplaced spin_unlock_bh in an error path.

Please pull or let me know if there are problems.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>