David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... The BTF conflicts were simple overlapping changes. The virtio_net conflict was an overlap of a fix of statistics counter, happening alongisde a move over to a bonafide statistics structure rather than counting value on the stack. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-08-02 10:55:32 -07:00
..
aoe	block drivers/block: Use octal not symbolic permissions	2018-05-24 13:38:59 -06:00
drbd	for-linus-20180706	2018-07-06 19:13:42 -07:00
mtip32xx	blk-mq: only iterate over inflight requests in blk_mq_tagset_busy_iter	2018-05-30 11:31:34 -06:00
paride	block: sanitize blk_get_request calling conventions	2018-05-14 08:55:12 -06:00
rsxx	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
xen-blkback	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
zram	treewide: Use array_size() in vzalloc()	2018-06-12 16:19:22 -07:00
DAC960.c	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
DAC960.h	DAC960: don't use block layer bounce buffers	2018-05-11 15:07:54 -06:00
Kconfig	null_blk: remove explicit 'select FAULT_INJECTION'	2018-01-11 07:58:31 -07:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
amiflop.c	genhd: Rename get_disk() to get_disk_and_module()	2018-02-26 09:48:42 -07:00
ataflop.c	genhd: Rename get_disk() to get_disk_and_module()	2018-02-26 09:48:42 -07:00
brd.c	block drivers/block: Use octal not symbolic permissions	2018-05-24 13:38:59 -06:00
cryptoloop.c	block: cryptoloop - Fix build warning	2017-09-26 07:41:22 -06:00
floppy.c	block drivers/block: Use octal not symbolic permissions	2018-05-24 13:38:59 -06:00
loop.c	for-linus-20180706	2018-07-06 19:13:42 -07:00
loop.h	loop: remember whether sysfs_create_group() was done	2018-05-07 15:26:36 -06:00
nbd.c	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
null_blk.c	for-linus-20180623	2018-06-24 06:33:54 +08:00
pktcdvd.c	Merge branch 'hch.procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2018-06-04 10:00:01 -07:00
ps3disk.c	ps3disk: handle highmem pages	2018-05-11 15:08:03 -06:00
ps3vram.c	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
rbd.c	The main piece is a set of libceph changes that revamps how OSD	2018-06-15 07:24:58 +09:00
rbd_types.h	rbd: RBD_V{1,2}_DATA_FORMAT macros	2017-02-20 12:16:15 +01:00
skd_main.c	block: Use blk_queue_flag_*() in drivers instead of queue_flag_*()	2018-03-08 14:13:48 -07:00
skd_s1120.h	skd: Use __packed only when needed	2017-08-18 08:45:29 -06:00
sunvdc.c	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
swim.c	block/swim: Select appropriate drive on device open	2018-04-16 21:49:35 -06:00
swim3.c	block/swim: Rename macros to avoid inconsistent inverted logic	2018-04-16 21:49:35 -06:00
swim_asm.S	…
sx8.c	block: sanitize blk_get_request calling conventions	2018-05-14 08:55:12 -06:00
umem.c	block: Fix a race between the cgroup code and request queue initialization	2018-02-28 12:23:35 -07:00
umem.h	…
virtio_blk.c	block drivers/block: Use octal not symbolic permissions	2018-05-24 13:38:59 -06:00
xen-blkfront.c	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
xsysace.c	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
z2ram.c	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00