]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
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)
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>

Trivial merge