You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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 8d49a77568d1: "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>
14 years ago
..
aoe
drivers/block/aoe/Makefile: replace the use of <module>-objs with <module>-y
14 years ago
drbd
drbd: fix up merge error
14 years ago
paride
paride: Convert to bdops->check_events()
14 years ago
DAC960.c
dac960: Convert to bdops->check_events()
14 years ago
DAC960.h
…
Kconfig
xen: separate out frontend xenbus
14 years ago
Makefile
drivers/block/Makefile: replace the use of <module>-objs with <module>-y
14 years ago
amiflop.c
Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block
14 years ago
ataflop.c
floppy,{ami|ata}flop: Convert to bdops->check_events()
14 years ago
brd.c
Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block
15 years ago
cciss.c
cciss: fix missed command status value CMD_UNABORTABLE
14 years ago
cciss.h
cciss: fix lost command issue
14 years ago
cciss_cmd.h
cciss: Inform controller we are using 32-bit tags.
14 years ago
cciss_scsi.c
Revert "cciss: Add missing allocation in scsi_cmd_stack_setup and corresponding deallocation"
14 years ago
cciss_scsi.h
…
cpqarray.c
block: remove per-queue plugging
14 years ago
cpqarray.h
…
cryptoloop.c
…
floppy.c
Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core
14 years ago
hd.c
block: remove wrappers for request type/flags
15 years ago
ida_cmd.h
…
ida_ioctl.h
…
loop.c
Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core
14 years ago
mg_disk.c
block: switch s390 tape_block and mg_disk to elevator_change()
15 years ago
nbd.c
nbd: remove module-level ioctl mutex
14 years ago
osdblk.c
block: remove spurious uses of REQ_HARDBARRIER
15 years ago
pktcdvd.c
Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core
14 years ago
ps3disk.c
Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block
15 years ago
ps3vram.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
15 years ago
rbd.c
rbd: use watch/notify for changes in rbd header
14 years ago
rbd_types.h
rbd: introduce rados block device (rbd), based on libceph
15 years ago
smart1,2.h
fix typos 'comamnd' -> 'command' in comments
14 years ago
sunvdc.c
block: Consolidate phys_segment and hw_segment limits
15 years ago
swim.c
swim[3]: Convert to bdops->check_events()
14 years ago
swim3.c
swim[3]: Convert to bdops->check_events()
14 years ago
swim_asm.S
…
sx8.c
block: Consolidate phys_segment and hw_segment limits
15 years ago
ub.c
ub: Convert to bdops->check_events()
14 years ago
umem.c
Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core
14 years ago
umem.h
…
viodasd.c
block: autoconvert trivial BKL users to private mutex
15 years ago
virtio_blk.c
Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block
15 years ago
xd.c
block: autoconvert trivial BKL users to private mutex
15 years ago
xd.h
…
xen-blkfront.c
Merge branch 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm
14 years ago
xsysace.c
Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block
14 years ago
z2ram.c
drivers/block/z2ram.c: correct printing of sector_t
14 years ago