Merge 5.9-rc2 into android-mainline

Linux 5.9-rc2 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I4dd4b70b085bfa0b5cb49ffa373c18cfe857bcf3
2020-08-24 10:01:23 +02:00
parent ccae99bd7c d012a7190f
commit e6d1601bb0
369 changed files with 4286 additions and 2214 deletions
--- a/include/linux/sched/user.h
+++ b/include/linux/sched/user.h
@@ -36,6 +36,9 @@ struct user_struct {
    defined(CONFIG_NET) || defined(CONFIG_IO_URING)
 	atomic_long_t locked_vm;
 #endif
+#ifdef CONFIG_WATCH_QUEUE
+	atomic_t nr_watches;	/* The number of watches this user currently has */
+#endif

 	/* Miscellaneous per-user rate limit */
 	struct ratelimit_state ratelimit;