]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge branch 'sctp-accept-deadlock'
authorDavid S. Miller <davem@davemloft.net>
Tue, 29 Sep 2015 04:03:40 +0000 (21:03 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 29 Sep 2015 04:03:40 +0000 (21:03 -0700)
Karl Heiss says:

====================
sctp: Fix SCTP deadlock

These patches fix a deadlock during accept() of an SCTP connection.

The first patch fixes whitespace issues.

The second patch actually fixes the deadlock race.
====================

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

Trivial merge