From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 7 Dec 2020 09:19:31 +0000 (+0100)
Subject: Merge 5.10-rc7 into tty-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ba3b8bb1263dfb87914ef0ccf5f3a78604b3686b;p=linux.git

Merge 5.10-rc7 into tty-next

We want the tty fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

ba3b8bb1263dfb87914ef0ccf5f3a78604b3686b
diff --cc include/linux/tty.h
index 67c7a07c8083e,eb33d948788cc..0c2f97ba80186
--- a/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;