diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-07 13:22:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-07 13:22:26 -0700 |
| commit | 2a9d6df425d7b46b23cbc8673b2dfefa4678abdb (patch) | |
| tree | a6ec2ee125a3c02342b48a2e4a36598c26ca2b8b /kernel | |
| parent | c902ce1bfb40d8b049bd2319b388b4b68b04bc27 (diff) | |
| parent | 7b28afe01ab6ffb5f152f47831b44933facd2328 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
* 'for-linus' of git://git.kernel.dk/linux-block:
drbd: we should write meta data updates with FLUSH FUA
drbd: fix limit define, we support 1 PiByte now
drbd: when receive times out on meta socket, also check last receive time on data socket
drbd: account bitmap IO during resync as resync-(related-)-io
drbd: don't cond_resched_lock with IRQs disabled
drbd: add missing spinlock to bitmap receive
drbd: Use the correct max_bio_size when creating resync requests
cfq-iosched: make code consistent
cfq-iosched: fix a rcu warning
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions