git.itanic.dy.fi Git - linux-stable/commit

]> git.itanic.dy.fi Git - linux-stable/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 24 Apr 2024 07:55:34 +0000 (17:55 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 24 Apr 2024 07:55:34 +0000 (17:55 +1000)
commit	86894913aeb59ab056aed74783694e961edb8387
tree	a762b47d1c2132d1c3ddf1ba93f5a14ef39504bb	tree \| snapshot
parent	9a9dfa9ca213d26ceaf9a38299b2c63a1f5ed2b3	commit \| diff
parent	24ddee0ff8c34256891323c92beeaa3bd55a0d30	commit \| diff

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git

# Conflicts:
# drivers/virtio/virtio_mem.c

Unnamed repository; edit this file 'description' to name the repository.

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/block/virtio_blk.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/virtual/mac80211_hwsim.c	diff1 \|	diff2 \|	blob \| history
drivers/virtio/virtio_mem.c	diff1 \|	diff2 \|	blob \| history