git.baikalelectronics.ru Git - kernel.git/commit

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 25 Jan 2021 10:19:46 +0000 (11:19 +0100)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 25 Jan 2021 10:19:46 +0000 (11:19 +0100)
commit	0f8b29fabacbcf0e617896c7ea832b7ea2ef2406
tree	0187f2baef24b5d78d94aecc7057356a36c58b5d	tree \| snapshot
parent	e71a8d5cf4b4f274740e31b601216071e2a11afa	commit \| diff
parent	6ee1d745b7c9fd573fba142a2efdad76a9f1cb04	commit \| diff

Merge 5.11-rc5 into tty-next

We need the fixes in here and this resolves a merge issue in
drivers/tty/tty_io.c

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