kernel-hacking-2024-linux-s.../drivers/s390
David S. Miller 68aaf44595 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor conflict in r8169, bug fix had two versions in net
and net-next, take the net-next hunks.

Signed-off-by: David S. Miller <davem@davemloft.net>
2019-08-27 14:23:31 -07:00
..
block
char
cio s390/qdio: let drivers opt-out from Output Queue scanning 2019-08-24 16:39:18 -07:00
crypto
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2019-08-27 14:23:31 -07:00
scsi
virtio
Makefile