OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
74f4392
5943691
)
Merge branch 'cnic'
author
David S. Miller
<davem@davemloft.net>
Tue, 3 Jun 2014 06:17:03 +0000
(23:17 -0700)
committer
David 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