Merge 5.10-rc7 into tty-next

We want the tty fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --cc drivers/tty/tty_io.c
Simple merge

diff --cc drivers/tty/tty_jobctrl.c
Simple merge

diff --cc include/linux/tty.h
index 67c7a07c8083ece1613cb26b7dadaa0b029b3b24,eb33d948788cc3ceed5a08ac1963fd05a5eff3f5..0c2f97ba80186a546273abecb411058a4521f2c9
--- 1/include/linux/tty.h
--- 2/include/linux/tty.h
+++ b/include/linux/tty.h
@@@ -303,8 -303,13 +303,12 @@@ struct tty_struct 
        spinlock_t flow_lock;
        /* Termios values are protected by the termios rwsem */
        struct ktermios termios, termios_locked;
 -      struct termiox *termiox;        /* May be NULL for unsupported */
        char name[64];
        struct pid *pgrp;               /* Protected by ctrl lock */
+       /*
+        * Writes protected by both ctrl lock and legacy mutex, readers must use
+        * at least one of them.
+        */
        struct pid *session;
        unsigned long flags;
        int count;