review.tizen.org Git - platform/kernel/linux-starfive.git/commit

projects / platform / kernel / linux-starfive.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9a0a930 2585cf9)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 13 Dec 2021 09:17:10 +0000 (10:17 +0100)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 13 Dec 2021 09:17:10 +0000 (10:17 +0100)
commit	af40d16042d674442db8cf5fd654fabcd45fea44
tree	56f80d083a4a7236a0ee7914ef2baa8222d65494	tree \| snapshot
parent	9a0a930fe2535a76ad70d3f43caeccf0d86a3009	commit \| diff
parent	2585cf9dfaaddf00b069673f27bb3f8530e2039c	commit \| diff

Merge v5.15-rc5 into char-misc-next

We need the fixes in here as well, and also resolve some merge conflicts
in:
drivers/misc/eeprom/at25.c

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/android/binder.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/eeprom/at25.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;