]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
sync to Linus v4.13-rc2 for subsystem developers to work against
authorJames Morris <james.l.morris@oracle.com>
Tue, 25 Jul 2017 00:44:18 +0000 (10:44 +1000)
committerJames Morris <james.l.morris@oracle.com>
Tue, 25 Jul 2017 00:44:18 +0000 (10:44 +1000)
1  2 
include/linux/lsm_hooks.h
kernel/fork.c

Simple merge
diff --cc kernel/fork.c
Simple merge