Merge remote-tracking branch 'integrity/next-integrity'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 8 Feb 2019 02:57:05 +0000 (13:57 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 8 Feb 2019 02:57:05 +0000 (13:57 +1100)
1  2 
arch/x86/kernel/kexec-bzimage64.c
fs/namei.c

Simple merge
diff --cc fs/namei.c
Simple merge