# git rev-parse -q --verify 86f84779d8e92a690b2f281175ea06b884cb6fa4^{commit} 86f84779d8e92a690b2f281175ea06b884cb6fa4 already have revision, skipping fetch # git checkout -q -f -B kisskb 86f84779d8e92a690b2f281175ea06b884cb6fa4 # git clean -qxdf # git log -1 commit 86f84779d8e92a690b2f281175ea06b884cb6fa4 Merge: ce38061 f6a0154 Author: Linus Torvalds Date: Tue Mar 6 12:41:30 2018 -0800 Merge branch 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace Pull sigingo fix from Eric Biederman: "The kbuild test robot found that I accidentally moved si_pkey when I was cleaning up siginfo_t. A short followed by an int with the int having 8 byte alignment. Sheesh siginfo_t is a weird structure. I have now corrected it and added build time checks that with a little luck will catch any similar future mistakes. The build time checks were sufficient for me to verify the bug and to verify my fix. So they are at least useful this once." * 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: signal/x86: Include the field offsets in the build time checks signal: Correct the offset of si_pkey in struct siginfo # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-gcc --version # < git log --format=%s --max-count=1 86f84779d8e92a690b2f281175ea06b884cb6fa4 # < make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # Added to kconfig # yes \n | make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- oldconfig yes: standard output: Broken pipe yes: write error # make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- /kisskb/src/drivers/infiniband/core/cq.c: In function 'ib_process_cq_direct': /kisskb/src/drivers/infiniband/core/cq.c:78:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ /kisskb/src/drivers/input/joystick/analog.c:176:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^ In file included from /kisskb/src/include/linux/kernel.h:11:0, from /kisskb/src/include/linux/interrupt.h:6, from /kisskb/src/drivers/infiniband/hw/bnxt_re/ib_verbs.c:39: /kisskb/src/drivers/infiniband/hw/bnxt_re/ib_verbs.c: In function 'bnxt_re_query_device': /kisskb/src/include/linux/bitops.h:7:24: warning: left shift count >= width of type [-Wshift-count-overflow] #define BIT(nr) (1UL << (nr)) ^ /kisskb/src/drivers/infiniband/hw/bnxt_re/bnxt_re.h:61:34: note: in expansion of macro 'BIT' #define BNXT_RE_MAX_MR_SIZE_HIGH BIT(39) ^ /kisskb/src/drivers/infiniband/hw/bnxt_re/bnxt_re.h:62:30: note: in expansion of macro 'BNXT_RE_MAX_MR_SIZE_HIGH' #define BNXT_RE_MAX_MR_SIZE BNXT_RE_MAX_MR_SIZE_HIGH ^ /kisskb/src/drivers/infiniband/hw/bnxt_re/ib_verbs.c:149:25: note: in expansion of macro 'BNXT_RE_MAX_MR_SIZE' ib_attr->max_mr_size = BNXT_RE_MAX_MR_SIZE; ^ /kisskb/src/drivers/infiniband/hw/bnxt_re/ib_verbs.c: In function 'bnxt_re_reg_user_mr': /kisskb/src/include/linux/bitops.h:7:24: warning: left shift count >= width of type [-Wshift-count-overflow] #define BIT(nr) (1UL << (nr)) ^ /kisskb/src/drivers/infiniband/hw/bnxt_re/bnxt_re.h:61:34: note: in expansion of macro 'BIT' #define BNXT_RE_MAX_MR_SIZE_HIGH BIT(39) ^ /kisskb/src/drivers/infiniband/hw/bnxt_re/bnxt_re.h:62:30: note: in expansion of macro 'BNXT_RE_MAX_MR_SIZE_HIGH' #define BNXT_RE_MAX_MR_SIZE BNXT_RE_MAX_MR_SIZE_HIGH ^ /kisskb/src/drivers/infiniband/hw/bnxt_re/ib_verbs.c:3588:15: note: in expansion of macro 'BNXT_RE_MAX_MR_SIZE' if (length > BNXT_RE_MAX_MR_SIZE) { ^ /kisskb/src/include/linux/bitops.h:7:24: warning: left shift count >= width of type [-Wshift-count-overflow] #define BIT(nr) (1UL << (nr)) ^ /kisskb/src/drivers/infiniband/hw/bnxt_re/bnxt_re.h:61:34: note: in expansion of macro 'BIT' #define BNXT_RE_MAX_MR_SIZE_HIGH BIT(39) ^ /kisskb/src/drivers/infiniband/hw/bnxt_re/bnxt_re.h:62:30: note: in expansion of macro 'BNXT_RE_MAX_MR_SIZE_HIGH' #define BNXT_RE_MAX_MR_SIZE BNXT_RE_MAX_MR_SIZE_HIGH ^ /kisskb/src/drivers/infiniband/hw/bnxt_re/ib_verbs.c:3590:12: note: in expansion of macro 'BNXT_RE_MAX_MR_SIZE' length, BNXT_RE_MAX_MR_SIZE); ^ /kisskb/src/drivers/infiniband/hw/bnxt_re/qplib_fp.c: In function 'bnxt_qplib_service_nq': /kisskb/src/drivers/infiniband/hw/bnxt_re/qplib_fp.c:333:23: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] bnxt_qplib_arm_srq((struct bnxt_qplib_srq *)q_handle, ^ /kisskb/src/drivers/infiniband/hw/bnxt_re/qplib_fp.c:336:12: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] (struct bnxt_qplib_srq *)q_handle, ^ In file included from /kisskb/src/include/linux/swab.h:5:0, from /kisskb/src/include/uapi/linux/byteorder/big_endian.h:13, from /kisskb/src/include/linux/byteorder/big_endian.h:5, from /kisskb/src/arch/mips/include/uapi/asm/byteorder.h:13, from /kisskb/src/arch/mips/include/asm/bitops.h:19, from /kisskb/src/include/linux/bitops.h:38, from /kisskb/src/include/linux/kernel.h:11, from /kisskb/src/include/linux/interrupt.h:6, from /kisskb/src/drivers/infiniband/hw/bnxt_re/qplib_fp.c:39: /kisskb/src/drivers/infiniband/hw/bnxt_re/qplib_fp.c: In function 'bnxt_qplib_create_srq': /kisskb/src/include/uapi/linux/swab.h:127:46: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] #define __swab64(x) (__u64)__builtin_bswap64((__u64)(x)) ^ /kisskb/src/include/uapi/linux/byteorder/big_endian.h:31:43: note: in expansion of macro '__swab64' #define __cpu_to_le64(x) ((__force __le64)__swab64((x))) ^ /kisskb/src/include/linux/byteorder/generic.h:86:21: note: in expansion of macro '__cpu_to_le64' #define cpu_to_le64 __cpu_to_le64 ^ /kisskb/src/drivers/infiniband/hw/bnxt_re/qplib_fp.c:569:19: note: in expansion of macro 'cpu_to_le64' req.srq_handle = cpu_to_le64(srq); ^ /kisskb/src/drivers/spi/spi-sh-msiof.c:77:0: warning: "STR" redefined #define STR 0x40 /* Status Register */ ^ In file included from /kisskb/src/arch/mips/include/asm/mach-generic/spaces.h:15:0, from /kisskb/src/arch/mips/include/asm/addrspace.h:13, from /kisskb/src/arch/mips/include/asm/barrier.h:11, from /kisskb/src/include/linux/compiler.h:245, from /kisskb/src/arch/mips/include/asm/bitops.h:16, from /kisskb/src/include/linux/bitops.h:38, from /kisskb/src/include/linux/bitmap.h:8, from /kisskb/src/drivers/spi/spi-sh-msiof.c:14: /kisskb/src/arch/mips/include/asm/mipsregs.h:29:0: note: this is the location of the previous definition #define STR(x) __STR(x) ^ /kisskb/src/drivers/net/ethernet/intel/i40e/i40e_ethtool.c: In function 'i40e_set_priv_flags': /kisskb/src/drivers/net/ethernet/intel/i40e/i40e_ethtool.c:4443:6: error: implicit declaration of function 'cmpxchg64' [-Werror=implicit-function-declaration] if (cmpxchg64(&pf->flags, orig_flags, new_flags) != orig_flags) { ^ cc1: some warnings being treated as errors /kisskb/src/scripts/Makefile.build:324: recipe for target 'drivers/net/ethernet/intel/i40e/i40e_ethtool.o' failed make[6]: *** [drivers/net/ethernet/intel/i40e/i40e_ethtool.o] Error 1 /kisskb/src/scripts/Makefile.build:583: recipe for target 'drivers/net/ethernet/intel/i40e' failed make[5]: *** [drivers/net/ethernet/intel/i40e] Error 2 /kisskb/src/scripts/Makefile.build:583: recipe for target 'drivers/net/ethernet/intel' failed make[4]: *** [drivers/net/ethernet/intel] Error 2 make[4]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:41:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:274:0: warning: "M_SPC_CFG_CLEAR" redefined #define M_SPC_CFG_CLEAR M_BCM1480_SPC_CFG_CLEAR ^ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:40:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:405:0: note: this is the location of the previous definition #define M_SPC_CFG_CLEAR _SB_MAKEMASK1(32) ^ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:41:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:275:0: warning: "M_SPC_CFG_ENABLE" redefined #define M_SPC_CFG_ENABLE M_BCM1480_SPC_CFG_ENABLE ^ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:40:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:406:0: note: this is the location of the previous definition #define M_SPC_CFG_ENABLE _SB_MAKEMASK1(33) ^ /kisskb/src/scripts/Makefile.build:583: recipe for target 'drivers/net/ethernet' failed make[3]: *** [drivers/net/ethernet] Error 2 make[3]: *** Waiting for unfinished jobs.... /kisskb/src/scripts/Makefile.build:583: recipe for target 'drivers/net' failed make[2]: *** [drivers/net] Error 2 make[2]: *** Waiting for unfinished jobs.... /kisskb/src/Makefile:1051: recipe for target 'drivers' failed make[1]: *** [drivers] Error 2 Makefile:146: recipe for target 'sub-make' failed make: *** [sub-make] Error 2 Command 'make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mips-allmodconfig_mipsel # Build took: 0:12:15.931962