someOS/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 5.8-rc6 into tty-next

Browse Source 
We need the serial/tty fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2020-07-20 09:39:11 +02:00
parent ea1be1e59b ba47d845d7
commit 6f2c6599ba
1395 changed files with 12317 additions and 6552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/video/fbdev/core/fbcon.c
View File

@@ -2402,7 +2402,8 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
ops->graphics = 1;
if (!blank) {
var.activate = FB_ACTIVATE_NOW | FB_ACTIVATE_FORCE;
var.activate = FB_ACTIVATE_NOW | FB_ACTIVATE_FORCE |
FB_ACTIVATE_KD_TEXT;
fb_set_var(info, &var);
ops->graphics = 0;
ops->var = info->var;