Merge branch 'cnic'
authorDavid S. Miller <davem@davemloft.net>
Tue, 3 Jun 2014 06:17:03 +0000 (23:17 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 3 Jun 2014 06:17:03 +0000 (23:17 -0700)
commit1299b3c49b7119ae534284e4129032441f40a422
tree9f6b56c5dd8b707327864ecfdaf667cc4db29acb
parent74f43922dc985119fa84c19c648445f81d0c7706
parent5943691442ae248977a2e3cac814ed5ac606903c
Merge branch 'cnic'

Michael Chan says:

====================
cnic fixes

Fix 2 sleeping function from invalid context bugs and 1 missing iscsi netlink
message bug.

v2: Fixed typo in rcu_dereference_protected() and tested with CONFIG_PROVE_RCU
====================

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