From: Greg Kroah-Hartman Date: Mon, 15 Mar 2021 07:43:49 +0000 (+0100) Subject: Merge 5.12-rc3 into tty-next X-Git-Tag: io_uring-5.13-2021-05-07~87^2~119 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=280def1e1c17d35b21206881937d4498bcc1f503;p=linux-block.git 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 --- 280def1e1c17d35b21206881937d4498bcc1f503