# git rev-parse -q --verify 638820d8da8ededd6dc609beaef02d5396599c03^{commit} 638820d8da8ededd6dc609beaef02d5396599c03 already have revision, skipping fetch # git checkout -q -f -B kisskb 638820d8da8ededd6dc609beaef02d5396599c03 # git clean -qxdf # < git log -1 # commit 638820d8da8ededd6dc609beaef02d5396599c03 # Merge: d5e4d81da4d4 3f6caaf5ff33 # Author: Linus Torvalds # Date: Wed Oct 24 11:49:35 2018 +0100 # # Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security # # Pull security subsystem updates from James Morris: # "In this patchset, there are a couple of minor updates, as well as some # reworking of the LSM initialization code from Kees Cook (these prepare # the way for ordered stackable LSMs, but are a valuable cleanup on # their own)" # # * 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: # LSM: Don't ignore initialization failures # LSM: Provide init debugging infrastructure # LSM: Record LSM name in struct lsm_info # LSM: Convert security_initcall() into DEFINE_LSM() # vmlinux.lds.h: Move LSM_TABLE into INIT_DATA # LSM: Convert from initcall to struct lsm_info # LSM: Remove initcall tracing # LSM: Rename .security_initcall section to .lsm_info # vmlinux.lds.h: Avoid copy/paste of security_init section # LSM: Correctly announce start of LSM initialization # security: fix LSM description location # keys: Fix the use of the C++ keyword "private" in uapi/linux/keyctl.h # seccomp: remove unnecessary unlikely() # security: tomoyo: Fix obsolete function # security/capabilities: remove check for -EINVAL # < /opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux-gcc --version # < git log --format=%s --max-count=1 638820d8da8ededd6dc609beaef02d5396599c03 # < make -s -j 48 ARCH=sparc64 O=/kisskb/build/linus_sparc64-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_HAVE_FTRACE_MCOUNT_RECORD=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MODULE_SIG=n # yes \n | make -s -j 48 ARCH=sparc64 O=/kisskb/build/linus_sparc64-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux- oldconfig yes: standard output: Broken pipe # make -s -j 48 ARCH=sparc64 O=/kisskb/build/linus_sparc64-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux- :1335:2: warning: #warning syscall rseq not implemented [-Wcpp] {standard input}: Assembler messages: {standard input}:73: Error: operation combines symbols in different segments {standard input}:141: Error: operation combines symbols in different segments {standard input}:307: Error: operation combines symbols in different segments {standard input}:73: Error: can't resolve `.text' {.text section} - `L0' {.tick_patch section} {standard input}:73: Error: can't resolve `.tick_patch_replacement' {.tick_patch_replacement section} - `L0' {.tick_patch section} {standard input}:141: Error: can't resolve `.text' {.text section} - `L0' {.tick_patch section} {standard input}:141: Error: can't resolve `.tick_patch_replacement' {.tick_patch_replacement section} - `L0' {.tick_patch section} {standard input}:307: Error: can't resolve `.text' {.text section} - `L0' {.tick_patch section} {standard input}:307: Error: can't resolve `.tick_patch_replacement' {.tick_patch_replacement section} - `L0' {.tick_patch section} make[3]: *** [/kisskb/src/scripts/Makefile.build:306: arch/sparc/vdso/vclock_gettime.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:546: arch/sparc/vdso] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1052: arch/sparc] Error 2 make[1]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/arch/sparc/include/asm/cmpxchg.h:5:0, from /kisskb/src/arch/sparc/include/asm/atomic_64.h:12, from /kisskb/src/arch/sparc/include/asm/atomic.h:5, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/include/asm-generic/bitops/lock.h:5, from /kisskb/src/arch/sparc/include/asm/bitops_64.h:52, from /kisskb/src/arch/sparc/include/asm/bitops.h:5, from /kisskb/src/include/linux/bitops.h:19, from /kisskb/src/include/linux/kernel.h:11, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/wait.h:7, from /kisskb/src/include/linux/wait_bit.h:8, from /kisskb/src/include/linux/fs.h:6, from /kisskb/src/fs/ocfs2/file.c:27: /kisskb/src/fs/ocfs2/file.c: In function 'ocfs2_file_write_iter': /kisskb/src/arch/sparc/include/asm/cmpxchg_64.h:55:22: warning: value computed is not used [-Wunused-value] #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) ^ /kisskb/src/fs/ocfs2/file.c:2386:3: note: in expansion of macro 'xchg' xchg(&iocb->ki_complete, saved_ki_complete); ^ make: *** [Makefile:146: sub-make] Error 2 Command 'make -s -j 48 ARCH=sparc64 O=/kisskb/build/linus_sparc64-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_sparc64-allmodconfig_sparc64 # Build took: 0:01:33.656173