Merge 9c577491b9 ("Merge branch 'work.dotdot1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs") into android-mainline

Tiny steps along the way for the 5.7-rc1 merge.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If23beaeedb986b9d82579e93786ec3a962c2367b
This commit is contained in:
Greg Kroah-Hartman
2020-04-07 10:07:34 +02:00
235 changed files with 11564 additions and 6583 deletions

View File

@@ -949,8 +949,8 @@ struct task_struct {
struct seccomp seccomp;
/* Thread group tracking: */
u32 parent_exec_id;
u32 self_exec_id;
u64 parent_exec_id;
u64 self_exec_id;
/* Protection against (de-)allocation: mm, files, fs, tty, keyrings, mems_allowed, mempolicy: */
spinlock_t alloc_lock;