David S. Miller fb796707d7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Both conflict were simple overlapping changes.

In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the
conversion of the driver in net-next to use in-netdev stats.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-04-21 20:23:53 -07:00

..

aoe

block: Use pointer to backing_dev_info from request_queue

2017-02-02 08:20:48 -07:00

drbd

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

mtip32xx

mtip32xx: pass BLK_MQ_F_NO_SCHED

2017-04-19 14:15:45 -06:00

paride

scripts/spelling.txt: add "overide" pattern and fix typo instances

2017-03-09 17:01:09 -08:00

rsxx

block: convert to device_add_disk()

2016-06-27 12:26:08 -07:00

xen-blkback

xen: modify xenstore watch event interface

2017-02-09 11:26:49 -05:00

zram

zram: do not use copy_page with non-page aligned address

2017-04-13 18:24:21 -07:00

amiflop.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08: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

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

cciss_cmd.h

…

cciss_scsi.c

cciss: Remove kmalloc cast

2017-02-22 11:54:49 -07:00

cciss_scsi.h

…

cciss.c

scsi: cciss: correct check map error.

2017-02-23 17:10:32 -05:00

cciss.h

SCSI misc on 20170220

2017-02-21 11:51:42 -08:00

cryptoloop.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

DAC960.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

DAC960.h

…

floppy.c

block: fold cmd_type into the REQ_OP_ space

2017-01-31 14:00:44 -07:00

hd.c

block: fold cmd_type into the REQ_OP_ space

2017-01-31 14:00:44 -07:00

Kconfig

virtio_blk: make SCSI passthrough support configurable

2017-01-31 10:53:10 -07:00

loop.c

Merge branch 'rebased-statx' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2017-03-03 11:38:56 -08:00

loop.h

block: loop: support DIO & AIO

2015-09-23 11:01:16 -06:00

Makefile

drivers:block: cpqarray clean up

2016-03-15 15:59:47 -07:00

mg_disk.c

block: fold cmd_type into the REQ_OP_ space

2017-01-31 14:00:44 -07:00

nbd.c

nbd: replace kill_bdev() with __invalidate_device()

2017-03-24 15:42:47 -06:00

null_blk.c

Merge branch 'for-4.11/next' into for-4.11/linus-merge

2017-02-17 14:08:19 -07:00

osdblk.c

block: fold cmd_type into the REQ_OP_ space

2017-01-31 14:00:44 -07:00

pktcdvd.c

block: Use pointer to backing_dev_info from request_queue

2017-02-02 08:20:48 -07:00

ps3disk.c

block: fold cmd_type into the REQ_OP_ space

2017-01-31 14:00:44 -07:00

ps3vram.c

block: convert to device_add_disk()

2016-06-27 12:26:08 -07:00

rbd_types.h

rbd: RBD_V{1,2}_DATA_FORMAT macros

2017-02-20 12:16:15 +01:00

rbd.c

rbd: supported_features bus attribute

2017-03-07 14:30:38 +01:00

skd_main.c

skd: implement trivial scsi ioctls directly

2017-01-31 10:53:03 -07:00

skd_s1120.h

…

smart1,2.h

…

sunvdc.c

sunvdc: Add support for setting physical sector size

2017-02-23 08:24:08 -08:00

swim3.c

sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>

2017-03-02 08:42:32 +01:00

swim_asm.S

…

swim.c

block: drop owner assignment from platform_drivers

2014-10-20 16:20:18 +02:00

sx8.c

block: fold cmd_type into the REQ_OP_ space

2017-01-31 14:00:44 -07:00

umem.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

umem.h

…

virtio_blk.c

virtio, vhost: optimizations, fixes

2017-03-02 13:53:13 -08:00

xen-blkfront.c

Merge branch 'for-4.11/next' into for-4.11/linus-merge

2017-02-17 14:08:19 -07:00

xsysace.c

block: fold cmd_type into the REQ_OP_ space

2017-01-31 14:00:44 -07:00

z2ram.c

block: remove struct request buffer member

2014-04-15 14:03:02 -06:00