git.kernel.dk Git - linux-block.git/commit

projects / linux-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 783100f 22a40d1)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 1 Jul 2024 11:55:39 +0000 (13:55 +0200)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 1 Jul 2024 11:55:39 +0000 (13:55 +0200)
commit	19ed3bb5587b30ace275cb604fb2b9c60dc49de0
tree	e44bf7a63c6df69dacd4ee4501a97618daa5c013	tree \| snapshot
parent	783100f6ea0ae74a4ff3d616d4bce3b54badf347	commit \| diff
parent	22a40d14b572deb80c0648557f4bd502d7e83826	commit \| diff

Merge 6.10-rc6 into char-misc-next

We need the char/misc/iio fixes in here as well to build on top of.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/iio/adc/xilinx-ams.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/dac/Kconfig	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)