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 ce40be7a82 Merge branch 'for-3.7/core' of git://git.kernel.dk/linux-block ... Pull block IO update from Jens Axboe: "Core block IO bits for 3.7. Not a huge round this time, it contains: - First series from Kent cleaning up and generalizing bio allocation and freeing. - WRITE_SAME support from Martin. - Mikulas patches to prevent O_DIRECT crashes when someone changes the block size of a device. - Make bio_split() work on data-less bio's (like trim/discards). - A few other minor fixups." Fixed up silent semantic mis-merge as per Mikulas Patocka and Andrew Morton. It is due to the VM no longer using a prio-tree (see commit 6b2dbba8b6ac: "mm: replace vma prio_tree with an interval tree"). So make set_blocksize() use mapping_mapped() instead of open-coding the internal VM knowledge that has changed. * 'for-3.7/core' of git://git.kernel.dk/linux-block: (26 commits) block: makes bio_split support bio without data scatterlist: refactor the sg_nents scatterlist: add sg_nents fs: fix include/percpu-rwsem.h export error percpu-rw-semaphore: fix documentation typos fs/block_dev.c:1644:5: sparse: symbol 'blkdev_mmap' was not declared blockdev: turn a rw semaphore into a percpu rw semaphore Fix a crash when block device is read and block size is changed at the same time block: fix request_queue->flags initialization block: lift the initial queue bypass mode on blk_register_queue() instead of blk_init_allocated_queue() block: ioctl to zero block ranges block: Make blkdev_issue_zeroout use WRITE SAME block: Implement support for WRITE SAME block: Consolidate command flag and queue limit checks for merges block: Clean up special command handling logic block/blk-tag.c: Remove useless kfree block: remove the duplicated setting for congestion_threshold block: reject invalid queue attribute values block: Add bio_clone_bioset(), bio_clone_kmalloc() block: Consolidate bio_alloc_bioset(), bio_kmalloc() ...		13 years ago
..
aoe	aoe: update aoe-internal version number to 50	13 years ago
drbd	block: Generalized bio pool freeing	13 years ago
mtip32xx	mtip32xx: fix user_buffer check in exec_drive_command	13 years ago
paride	paride/pcd: fix bool verbose module parameter.	13 years ago
xen-blkback	Features:	13 years ago
DAC960.c	dac960: Remove unused variables from DAC960_CreateProcEntries()	13 years ago
DAC960.h	…
Kconfig	block: remove the deprecated ub driver	13 years ago
Makefile	block: remove the deprecated ub driver	13 years ago
amiflop.c	…
ataflop.c	…
brd.c	block: remove the second argument of k[un]map_atomic()	13 years ago
cciss.c	block: add and use scsi_blk_cmd_ioctl	13 years ago
cciss.h	…
cciss_cmd.h	…
cciss_scsi.c	cciss: fix handling of protocol error	13 years ago
cciss_scsi.h	…
cpqarray.c	…
cpqarray.h	…
cryptoloop.c	…
floppy.c	workqueue: deprecate __cancel_delayed_work()	13 years ago
hd.c	Remove all #inclusions of asm/system.h	13 years ago
ida_cmd.h	…
ida_ioctl.h	…
loop.c	userns: Convert loop to use kuid_t instead of uid_t	13 years ago
mg_disk.c	mg_disk: Use struct dev_pm_ops for power management	13 years ago
nbd.c	nbd: handle discard requests	13 years ago
nvme.c	PCI changes for the 3.7 merge window:	13 years ago
osdblk.c	block: Add bio_clone_bioset(), bio_clone_kmalloc()	13 years ago
pktcdvd.c	pktcdvd: Switch to bio_kmalloc()	13 years ago
ps3disk.c	…
ps3vram.c	…
rbd.c	rbd: BUG on invalid layout	13 years ago
rbd_types.h	rbd: define some new format constants	13 years ago
smart1,2.h	…
sunvdc.c	powerpc+sparc/vio: Modernize driver registration	13 years ago
swim.c	…
swim3.c	…
swim_asm.S	…
sx8.c	block, sx8: fix pointer math issue getting fw version	13 years ago
umem.c	blk: pass from_schedule to non-request unplug functions.	13 years ago
umem.h	…
virtio_blk.c	virtio-blk: Disable callback in virtblk_done()	13 years ago
xd.c	Remove all #inclusions of asm/system.h	13 years ago
xd.h	…
xen-blkfront.c	workqueue: deprecate flush[_delayed]_work_sync()	13 years ago
xsysace.c	…
z2ram.c	…