Jakub Kicinski 5c39f26e67 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Trivial conflict in CAN, keep the net-next + the byteswap wrapper. Conflicts: drivers/net/can/usb/gs_usb.c Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2020-11-27 18:25:27 -08:00
..
block	s390/dasd: fix null pointer dereference for ERP requests	2020-11-16 08:28:02 -07:00
char	s390 updates for the 5.10 merge window	2020-10-16 12:36:38 -07:00
cio	s390 updates for the 5.10 merge window	2020-10-16 12:36:38 -07:00
crypto	s390/pkey: fix paes selftest failure with paes and pkey static build	2020-11-03 15:12:16 +01:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-11-27 18:25:27 -08:00
scsi	s390 updates for the 5.10 merge window	2020-10-16 12:36:38 -07:00
virtio	s390/virtio: remove unused pm callbacks	2020-06-16 13:44:04 +02:00
Makefile	s390: remove pointless drivers-y in drivers/s390/Makefile	2019-09-16 13:21:51 +02:00