David S. Miller b04096ff33 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Four minor merge conflicts: 1) qca_spi.c renamed the local variable used for the SPI device from spi_device to spi, meanwhile the spi_set_drvdata() call got moved further up in the probe function. 2) Two changes were both adding new members to codel params structure, and thus we had overlapping changes to the initializer function. 3) 'net' was making a fix to sk_release_kernel() which is completely removed in 'net-next'. 4) In net_namespace.c, the rtnl_net_fill() call for GET operations had the command value fixed, meanwhile 'net-next' adjusted the argument signature a bit. This also matches example merge resolutions posted by Stephen Rothwell over the past two days. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-05-13 14:31:43 -04:00
..
aoe	block: remove artifical max_hw_sectors cap	2014-10-21 14:02:54 -06:00
drbd	net: Add a struct net parameter to sock_create_kern	2015-05-11 10:50:17 -04:00
mtip32xx	blk-mq: add a 'list' parameter to ->queue_rq()	2014-10-29 11:14:52 -06:00
paride	paride: fix the "verbose" module param	2015-04-15 16:35:22 -07:00
rsxx	block/rsxx: use generic io stats accounting functions to simplify io stat accounting	2014-11-24 08:05:18 -07:00
xen-blkback	xen/grant: introduce func gnttab_unmap_refs_sync()	2015-04-27 11:41:12 +01:00
zram	revert "zram: move compact_store() to sysfs functions area"	2015-05-05 17:10:10 -07:00
amiflop.c	block: drop owner assignment from platform_drivers	2014-10-20 16:20:18 +02:00
ataflop.c	Merge branch 'for-3.16/core' of git://git.kernel.dk/linux-block into next	2014-06-02 09:29:34 -07:00
brd.c	brd: rename XIP to DAX	2015-02-16 17:56:04 -08:00
cciss_cmd.h
cciss_scsi.c	cciss: switch to ->show_info()	2013-04-09 14:13:19 -04:00
cciss_scsi.h
cciss.c	block: use pci_zalloc_consistent	2014-08-08 15:57:28 -07:00
cciss.h
cpqarray.c	genirq: Remove the deprecated 'IRQF_DISABLED' request_irq() flag entirely	2015-03-05 20:53:06 +01:00
cpqarray.h
cryptoloop.c	move linux/loop.h to drivers/block	2013-06-29 12:46:45 +04:00
DAC960.c	block: use pci_zalloc_consistent	2014-08-08 15:57:28 -07:00
DAC960.h
floppy.c	floppy: Avoid manual call of device_create_file()	2015-02-03 13:00:36 +01:00
hd.c	block: hd: remove deprecated IRQF_DISABLED	2014-10-01 08:16:07 -06:00
ida_cmd.h
ida_ioctl.h
Kconfig	drivers/block/pmem: Add a driver for persistent memory	2015-04-01 17:03:56 +02:00
loop.c	block: destroy bdi before blockdev is unregistered.	2015-04-27 10:27:20 -06:00
loop.h	loop: add blk-mq.h include	2015-01-02 15:20:25 -07:00
Makefile	drivers/block/pmem: Add a driver for persistent memory	2015-04-01 17:03:56 +02:00
mg_disk.c	block: drop owner assignment from platform_drivers	2014-10-20 16:20:18 +02:00
nbd.c	nbd: Return error pointer directly	2015-04-02 12:39:28 -06:00
null_blk.c	null_blk: suppress invalid partition info	2015-01-16 16:02:24 -07:00
nvme-core.c	Merge branch 'for-4.1/drivers' of git://git.kernel.dk/linux-block	2015-04-16 22:05:27 -04:00
nvme-scsi.c	NVMe: Fix VPD B0 max sectors translation	2015-04-23 10:25:36 -06:00
osdblk.c	block: support different tag allocation policy	2015-01-23 14:15:46 -07:00
pktcdvd.c	block,scsi: fixup blk_get_request dead queue scenarios	2014-08-28 10:03:46 -06:00
pmem.c	drivers/block/pmem: Fix 32-bit build warning in pmem_alloc()	2015-04-01 17:03:57 +02:00
ps3disk.c	block: Kill bio_segments()/bi_vcnt usage	2013-11-23 22:33:51 -08:00
ps3vram.c	block: Convert bio_for_each_segment() to bvec_iter	2013-11-23 22:33:49 -08:00
rbd_types.h	rbd: get rid of RBD_MAX_SEG_NAME_LEN	2012-12-17 08:37:29 -06:00
rbd.c	rbd: end I/O the entire obj_request on error	2015-05-01 16:44:30 -07:00
skd_main.c	block: disable entropy contributions for nonrot devices	2014-10-04 10:55:32 -06:00
skd_s1120.h	skd: fix formatting in skd_s1120.h	2013-11-08 09:10:30 -07:00
smart1,2.h
sunvdc.c	sunvdc: reconnect ldc after vds service domain restarts	2014-12-11 18:52:45 -08:00
swim3.c	powerpc: Move Power Macintosh drivers to generic byteswappers	2015-03-23 14:29:40 +11:00
swim_asm.S
swim.c	block: drop owner assignment from platform_drivers	2014-10-20 16:20:18 +02:00
sx8.c	block,scsi: fixup blk_get_request dead queue scenarios	2014-08-28 10:03:46 -06:00
umem.c	block: Convert drivers to immutable biovecs	2013-11-23 22:33:51 -08:00
umem.h
virtio_blk.c	sd, mmc, virtio_blk, string_helpers: fix block size units	2015-04-10 16:27:48 -07:00
xen-blkfront.c	xenbus_client: Extend interface to support multi-page ring	2015-04-15 10:56:47 +01:00
xsysace.c	block: systemace: Remove .owner field for driver	2014-08-21 20:37:54 -05:00
z2ram.c	block: remove struct request buffer member	2014-04-15 14:03:02 -06:00