From: Greg Kroah-Hartman Date: Mon, 25 Jan 2021 10:19:46 +0000 (+0100) Subject: Merge 5.11-rc5 into tty-next X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0f8b29fabacbcf0e617896c7ea832b7ea2ef2406;p=linux.git 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 --- 0f8b29fabacbcf0e617896c7ea832b7ea2ef2406