Merge branch 'sock-lockdep-tightening'
authorDavid S. Miller <davem@davemloft.net>
Thu, 7 Apr 2016 20:44:15 +0000 (16:44 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 7 Apr 2016 20:44:15 +0000 (16:44 -0400)
commit1fbbe1a8a9b195c4ac856540dfaef49d663c2e91
tree24f93b5ab435e0bd4cada95b9f91df0a2e205186
parent8501786929de4616b10b8059ad97abd304a7dddf
parent8ced425ee630c03beea06c1dfa35190bf8395d07
Merge branch 'sock-lockdep-tightening'

Hannes Frederic Sowa says:

====================
sock: lockdep tightening

First patch is from Eric Dumazet and improves lockdep accuracy for
socket locks. After that, second patch introduces lockdep_sock_is_held
and uses it. Final patch reverts and reworks the lockdep fix from Daniel
in the filter code, as we now have tighter lockdep support.
====================

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