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	e5dabdcad72cfaf82f5fc176606baec507506378
tree	0187f2baef24b5d78d94aecc7057356a36c58b5d	tree \| snapshot
parent	871c04e9b600ea7e6252482251be0a20343e0d00	commit \| diff
parent	d3fdd1bcd9c220739ee087fbcd1863a2f936b6a3	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>