Jakub Kicinski adc2e56ebe Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Trivial conflicts in net/can/isotp.c and tools/testing/selftests/net/mptcp/mptcp_connect.sh scaled_ppm_to_ppb() was moved from drivers/ptp/ptp_clock.c to include/linux/ptp_clock_kernel.h in -next so re-apply the fix there. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-06-18 19:47:02 -07:00
..
block	s390/dasd: add missing discipline function	2021-05-25 12:54:00 -06:00
char	s390 updates for 5.13 merge window	2021-04-27 17:54:15 -07:00
cio	vfio-ccw: Serialize FSM IDLE state with I/O completion	2021-05-12 12:59:50 +02:00
crypto	VFIO updates for v5.13-rc1	2021-04-28 17:19:47 -07:00
net	s390/netiuvc: get rid of forward declarations	2021-06-12 13:06:33 -07:00
scsi	SCSI misc on 20210428	2021-04-28 17:22:10 -07:00
virtio	virtio/s390: implement virtio-ccw revision 2 correctly	2021-02-24 00:31:23 +01:00
Makefile	s390: remove pointless drivers-y in drivers/s390/Makefile	2019-09-16 13:21:51 +02:00