David S. Miller 3793faad7b Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts were all overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-05-06 22:10:13 -07:00
..
block	s390/dasd: remove IOSCHED_DEADLINE from DASD Kconfig	2020-04-17 08:05:27 -06:00
char	s390: use fallthrough;	2020-03-25 12:39:37 +01:00
cio	s390/cio: generate delayed uevent for vfio-ccw subchannels	2020-04-06 14:02:28 +02:00
crypto	s390 updates for the 5.7 merge window	2020-04-04 09:45:50 -07:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-06 22:10:13 -07:00
scsi	SCSI misc on 20200410	2020-04-10 12:21:11 -07: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