Merge 5.12-rc3 into tty-next

Resolves a merge issue with:
	drivers/tty/hvc/hvcs.c
and we want the tty/serial fixes from 5.12-rc3 in here as well.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/hamradio/6pack.c
Simple merge

diff --cc drivers/tty/hvc/hvcs.c
Simple merge

diff --cc drivers/tty/tty_io.c
Simple merge