David S. Miller 9f6e055907 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

The mptcp conflict was overlapping additions.

The SMC conflict was an additional and removal happening at the same
time.

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

2020-02-27 18:31:39 -08:00

..

block

proc: convert everything to "struct proc_ops"

2020-02-04 03:05:26 +00:00

char

compat_ioctl: move tape handling into drivers

2019-10-23 17:23:44 +02:00

cio

s390/qdio: fill SL with absolute addresses

2020-02-19 17:26:32 +01:00

crypto

s390/pkey/zcrypt: spelling s/crytp/crypt/

2020-02-17 18:01:57 +01:00

net

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2020-02-27 18:31:39 -08:00

scsi

s390/qdio: fill SBALEs with absolute addresses

2020-02-19 17:26:32 +01:00

virtio

virtio/s390: fix race on airq_areas[]

2019-07-26 13:36:18 +02:00

Makefile

s390: remove pointless drivers-y in drivers/s390/Makefile

2019-09-16 13:21:51 +02:00