Jens Axboe 5c04b426f2 Merge branch 'v3.1-rc10' into for-3.2/core ...

Conflicts:
	block/blk-core.c
	include/linux/blkdev.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>

2011-10-19 14:30:42 +02:00

..

drbd_actlog.c

drbd: we should write meta data updates with FLUSH FUA

2011-06-30 09:23:46 +02:00

drbd_bitmap.c

drbd: account bitmap IO during resync as resync-(related-)-io

2011-06-30 09:23:43 +02:00

drbd_int.h

block: remove support for bio remapping from ->make_request

2011-09-12 12:12:01 +02:00

drbd_main.c

drbd: Fix spelling

2011-05-24 10:21:29 +02:00

drbd_nl.c

drivers/block/drbd/drbd_nl.c: use bitmap_parse instead of __bitmap_parse

2011-08-02 12:43:49 +02:00

drbd_proc.c

drbd: allow petabyte storage on 64bit arch

2011-03-10 11:43:24 +01:00

drbd_receiver.c

drbd: when receive times out on meta socket, also check last receive time on data socket

2011-06-30 09:23:44 +02:00

drbd_req.c

block: remove support for bio remapping from ->make_request

2011-09-12 12:12:01 +02:00

drbd_req.h

drbd: fix warning

2011-05-24 10:38:33 +02:00

drbd_strings.c

drbd: Rename enum drbd_state_ret_codes to enum drbd_state_rv

2011-03-10 11:36:18 +01:00

drbd_vli.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

drbd_worker.c

drbd: Use the correct max_bio_size when creating resync requests

2011-06-30 09:23:40 +02:00

drbd_wrappers.h

drbd: Get rid of unnecessary macros (2)

2011-03-10 11:36:15 +01:00

Kconfig

drbd: Kconfig fix

2009-12-29 17:38:28 +01:00

Makefile

drbd: remove tracing bits

2009-10-01 21:17:58 +02:00