David S. Miller ac80010fc9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Mere overlapping changes in the conflicts here. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-12-22 15:15:05 -08:00
..
block	s390/dasd: fix typo in copyright statement	2019-12-20 11:52:01 -07:00
char	compat_ioctl: move tape handling into drivers	2019-10-23 17:23:44 +02:00
cio	s390/dasd/cio: Interpret ccw_device_get_mdc return value correctly	2019-12-20 11:52:01 -07:00
crypto	s390/zcrypt: handle new reply code FILTERED_BY_HYPERVISOR	2019-11-30 10:52:44 +01:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-12-22 15:15:05 -08:00
scsi	scsi: zfcp: trace channel log even for FCP command responses	2019-10-28 22:16:15 -04: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