Repository files (latest commit first)

Filename	Latest commit message	Latest commit date
Linus Torvalds 7e599e6e62 drbd: fix up merge error ... In commit 95a0f10cdd ("drbd: store in-core bitmap little endian, regardless of architecture") drbd had made the sane choice to use little-endian bitmap functions everywhere. However, it used the horrible old functions names from <asm-generic/bitops/le.h>, that were never really meant to be exported. In the meantime, things got cleaned up, and in commit c4945b9ed4 ("asm-generic: rename generic little-endian bitops functions") we renamed the LE bitops to something sane, exactly so that they could be used in random code without people gouging their eyes out when seeing the crazy jumble of letters that were the old internal names. As a result the drbd thing merged cleanly (commit 8d49a77568: "Merge branch 'for-2.6.39/drivers' of git://git.kernel.dk/linux-2.6-block"), since there was no data conflict - but the end result obviously doesn't actually compile. Reported-and-tested-by: Ingo Molnar <mingo@elte.hu> Cc: Jens Axboe <jaxboe@fusionio.com> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2011-03-28 07:42:58 -07:00
..
aoe	drivers/block/aoe/Makefile: replace the use of <module>-objs with <module>-y	2011-01-19 08:25:02 -07:00
drbd	drbd: fix up merge error	2011-03-28 07:42:58 -07:00
paride	paride: Convert to bdops->check_events()	2011-03-09 19:54:28 +01:00
amiflop.c	Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block	2011-03-24 10:16:26 -07:00
ataflop.c	floppy,{ami|ata}flop: Convert to bdops->check_events()	2011-03-09 19:54:27 +01:00
brd.c	Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block	2010-10-22 17:07:18 -07:00
cciss.c	cciss: fix missed command status value CMD_UNABORTABLE	2011-03-12 10:02:30 +01:00
cciss.h	cciss: fix lost command issue	2011-03-23 20:47:11 +01:00
cciss_cmd.h	cciss: Inform controller we are using 32-bit tags.	2011-03-12 10:02:16 +01:00
cciss_scsi.c	Revert "cciss: Add missing allocation in scsi_cmd_stack_setup and corresponding deallocation"	2011-03-12 13:47:51 +01:00
cciss_scsi.h
cpqarray.c	block: remove per-queue plugging	2011-03-10 08:52:07 +01:00
cpqarray.h
cryptoloop.c
DAC960.c	dac960: Convert to bdops->check_events()	2011-03-09 19:54:28 +01:00
DAC960.h
floppy.c	Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core	2011-03-10 08:58:35 +01:00
hd.c	block: remove wrappers for request type/flags	2010-08-07 18:17:56 +02:00
ida_cmd.h
ida_ioctl.h
Kconfig	xen: separate out frontend xenbus	2011-01-05 16:29:17 -05:00
loop.c	Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core	2011-03-10 08:58:35 +01:00
Makefile	drivers/block/Makefile: replace the use of <module>-objs with <module>-y	2011-01-19 08:25:02 -07:00
mg_disk.c	block: switch s390 tape_block and mg_disk to elevator_change()	2010-08-23 14:02:44 +02:00
nbd.c	nbd: remove module-level ioctl mutex	2011-02-11 16:12:20 -08:00
osdblk.c	block: remove spurious uses of REQ_HARDBARRIER	2010-09-10 12:35:36 +02:00
pktcdvd.c	Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core	2011-03-10 08:58:35 +01:00
ps3disk.c	Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block	2010-10-22 17:07:18 -07:00
ps3vram.c
rbd.c	rbd: use watch/notify for changes in rbd header	2011-03-22 11:33:56 -07:00
rbd_types.h	rbd: introduce rados block device (rbd), based on libceph	2010-10-20 15:38:13 -07:00
smart1,2.h	fix typos 'comamnd' -> 'command' in comments	2011-02-02 11:31:21 +01:00
sunvdc.c
swim.c	swim[3]: Convert to bdops->check_events()	2011-03-09 19:54:28 +01:00
swim3.c	swim[3]: Convert to bdops->check_events()	2011-03-09 19:54:28 +01:00
swim_asm.S
sx8.c
ub.c	ub: Convert to bdops->check_events()	2011-03-09 19:54:28 +01:00
umem.c	Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core	2011-03-10 08:58:35 +01:00
umem.h
viodasd.c	block: autoconvert trivial BKL users to private mutex	2010-10-05 15:01:10 +02:00
virtio_blk.c	Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block	2010-10-22 17:07:18 -07:00
xd.c	block: autoconvert trivial BKL users to private mutex	2010-10-05 15:01:10 +02:00
xd.h
xen-blkfront.c	Merge branch 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm	2011-03-15 10:59:09 -07:00
xsysace.c	Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block	2011-03-24 10:16:26 -07:00
z2ram.c	drivers/block/z2ram.c: correct printing of sector_t	2010-10-28 06:15:26 -06:00