# git rev-parse -q --verify 8d01b66b4f23a9fcf5c6787b27f0be5f8cbae98c^{commit} 8d01b66b4f23a9fcf5c6787b27f0be5f8cbae98c already have revision, skipping fetch # git checkout -q -f -B kisskb 8d01b66b4f23a9fcf5c6787b27f0be5f8cbae98c # git clean -qxdf # git log -1 commit 8d01b66b4f23a9fcf5c6787b27f0be5f8cbae98c Merge: 2faf962 341a670 Author: Linus Torvalds Date: Tue Sep 1 13:29:48 2015 -0700 Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC 64-bit changes from Olof Johansson: "Here's our branch of ARM64 contents for this merge window. Most of this is DT contents for new SoCs (or those who have seen new device support added). Maybe we should stop separating out the arm64 contents here to avoid the kind of internal conflicts as we got this time around, where 32- and 64-bit contents conflicted. Anyhow, on the actual contents: New SoCs: - Broadcom North Star 2 (ns2) - Marvell Berlin4CT - Mediatek MT6795 - Rockchip RK3368 In addition, there are enhancements for the following platforms: - Mediatek MT8173: cpuidle-dt updates, misc other additions - ZyncMP: A bunch of devices added to the existing DTSI - Qualcomm MSM8916 and APQ8016 updates for USB, etc. + a handful of other updates for various platforms" * tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (47 commits) ARM64: dts: vexpress: Use assigned-clock-parents for sp810 ARM64: dts: mt6795: enable basic SMP bringup for MT6795 arm64: Enable Marvell Berlin SoC family in defconfig arm64: Enable Marvell Berlin SoC family in Kconfig arm64: dts: Add dts files for Marvell Berlin4CT SoC ARM64: zynqmp: Move SPI nodes to the right location ARM64: zynqmp: Move uart and ttcs to the right location ARM64: zynqmp: Enable spi flashes on ep108 ARM64: zynqmp: Add eeprom memories on i2c bus ARM64: zynqmp: Enable sdhci on ep108 ARM64: zynqmp: Enable watchdog on ep108 ARM64: zynqmp: Add DWC3 usb support ARM64: zynqmp: Add SMMU support ARM64: zynqmp: Add CANs node for platform ARM64: zynqmp: Use zynqmp specific compatible string for gpio devicetree: xilinx: zynqmp: add sata node PCI: iproc: Fix BCMA dependency in Kconfig arm64: dts: Add Broadcom North Star 2 support arm64: Add Broadcom iProc family support PCI: iproc: Fix ARM64 dependency in Kconfig ... # < /opt/cross/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi-gcc --version # < git log --format=%s --max-count=1 8d01b66b4f23a9fcf5c6787b27f0be5f8cbae98c # < make -j 240 ARCH=arm O=/home/kisskb/slave/build/linus_arm-randconfig_arm CROSS_COMPILE=/opt/cross/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi- randconfig KCONFIG_SEED=0x604E963E warning: (ARCH_INTEGRATOR && ARCH_MULTIPLATFORM && ARCH_EP93XX && ARCH_SHMOBILE_LEGACY) selects ARM_PATCH_PHYS_VIRT which has unmet direct dependencies (!XIP_KERNEL && MMU && (!ARCH_REALVIEW || !SPARSEMEM)) # make -j 240 ARCH=arm O=/home/kisskb/slave/build/linus_arm-randconfig_arm CROSS_COMPILE=/opt/cross/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi- make[1]: Entering directory `/home/kisskb/slave/build/linus_arm-randconfig_arm' GEN ./Makefile scripts/kconfig/conf --silentoldconfig Kconfig .config:342:warning: symbol value '' invalid for PAGE_OFFSET warning: (ARCH_INTEGRATOR && ARCH_MULTIPLATFORM && ARCH_EP93XX && ARCH_SHMOBILE_LEGACY) selects ARM_PATCH_PHYS_VIRT which has unmet direct dependencies (!XIP_KERNEL && MMU && (!ARCH_REALVIEW || !SPARSEMEM)) warning: (ARCH_INTEGRATOR && ARCH_MULTIPLATFORM && ARCH_EP93XX && ARCH_SHMOBILE_LEGACY) selects ARM_PATCH_PHYS_VIRT which has unmet direct dependencies (!XIP_KERNEL && MMU && (!ARCH_REALVIEW || !SPARSEMEM)) # # configuration written to .config # make[1]: Leaving directory `/home/kisskb/slave/build/linus_arm-randconfig_arm' make[1]: Entering directory `/home/kisskb/slave/build/linus_arm-randconfig_arm' CHK include/config/kernel.release GEN ./Makefile WRAP arch/arm/include/generated/asm/bitsperlong.h WRAP arch/arm/include/generated/asm/cputime.h WRAP arch/arm/include/generated/asm/current.h WRAP arch/arm/include/generated/asm/emergency-restart.h WRAP arch/arm/include/generated/asm/errno.h WRAP arch/arm/include/generated/asm/exec.h CHK include/generated/uapi/linux/version.h WRAP arch/arm/include/generated/asm/ioctl.h WRAP arch/arm/include/generated/asm/ipcbuf.h WRAP arch/arm/include/generated/asm/irq_regs.h WRAP arch/arm/include/generated/asm/kdebug.h UPD include/generated/uapi/linux/version.h WRAP arch/arm/include/generated/asm/local.h WRAP arch/arm/include/generated/asm/local64.h WRAP arch/arm/include/generated/asm/mcs_spinlock.h WRAP arch/arm/include/generated/asm/mm-arch-hooks.h WRAP arch/arm/include/generated/asm/msgbuf.h WRAP arch/arm/include/generated/asm/param.h WRAP arch/arm/include/generated/asm/parport.h WRAP arch/arm/include/generated/asm/poll.h WRAP arch/arm/include/generated/asm/preempt.h WRAP arch/arm/include/generated/asm/resource.h WRAP arch/arm/include/generated/asm/rwsem.h WRAP arch/arm/include/generated/asm/seccomp.h WRAP arch/arm/include/generated/asm/sections.h WRAP arch/arm/include/generated/asm/segment.h WRAP arch/arm/include/generated/asm/sembuf.h WRAP arch/arm/include/generated/asm/serial.h WRAP arch/arm/include/generated/asm/shmbuf.h WRAP arch/arm/include/generated/asm/siginfo.h WRAP arch/arm/include/generated/asm/simd.h WRAP arch/arm/include/generated/asm/socket.h WRAP arch/arm/include/generated/asm/sockios.h WRAP arch/arm/include/generated/asm/sizes.h UPD include/config/kernel.release WRAP arch/arm/include/generated/asm/termbits.h WRAP arch/arm/include/generated/asm/termios.h WRAP arch/arm/include/generated/asm/timex.h HOSTCC scripts/basic/bin2c WRAP arch/arm/include/generated/asm/trace_clock.h WRAP arch/arm/include/generated/asm/unaligned.h Using /home/kisskb/slave/src as source for kernel CHK include/generated/utsrelease.h UPD include/generated/utsrelease.h HOSTCC scripts/kallsyms HOSTCC scripts/conmakehash HOSTCC scripts/asn1_compiler HOSTCC scripts/genksyms/genksyms.o SHIPPED scripts/genksyms/parse.tab.c SHIPPED scripts/genksyms/lex.lex.c SHIPPED scripts/genksyms/keywords.hash.c SHIPPED scripts/genksyms/parse.tab.h CC scripts/mod/empty.o HOSTCC scripts/mod/mk_elfconfig HOSTCC scripts/genksyms/parse.tab.o CC scripts/mod/devicetable-offsets.s HOSTCC scripts/genksyms/lex.lex.o Generating include/generated/mach-types.h GEN scripts/mod/devicetable-offsets.h CHK include/generated/timeconst.h CC kernel/bounds.s UPD include/generated/timeconst.h CHK include/generated/bounds.h UPD include/generated/bounds.h CC arch/arm/kernel/asm-offsets.s MKELF scripts/mod/elfconfig.h HOSTCC scripts/mod/modpost.o HOSTCC scripts/mod/file2alias.o HOSTCC scripts/mod/sumversion.o In file included from /home/kisskb/slave/src/arch/arm/kernel/asm-offsets.c:15:0: /home/kisskb/slave/src/include/linux/mm.h: In function 'virt_to_head_page': /home/kisskb/slave/src/include/linux/mm.h:549:1: error: invalid suffix "xUL" on integer constant In file included from /home/kisskb/slave/src/include/linux/dma-mapping.h:9:0, from /home/kisskb/slave/src/arch/arm/kernel/asm-offsets.c:16: /home/kisskb/slave/src/include/linux/scatterlist.h: In function 'sg_set_buf': /home/kisskb/slave/src/include/linux/scatterlist.h:142:1: error: invalid suffix "xUL" on integer constant In file included from /home/kisskb/slave/src/arch/arm/include/asm/dma-mapping.h:42:0, from /home/kisskb/slave/src/include/linux/dma-mapping.h:86, from /home/kisskb/slave/src/arch/arm/kernel/asm-offsets.c:16: /home/kisskb/slave/src/include/asm-generic/dma-mapping-common.h: In function 'dma_map_single_attrs': /home/kisskb/slave/src/include/asm-generic/dma-mapping-common.h:20:1: error: invalid suffix "xUL" on integer constant /home/kisskb/slave/src/include/asm-generic/dma-mapping-common.h:23:1: error: invalid suffix "xUL" on integer constant In file included from /home/kisskb/slave/src/include/linux/dma-mapping.h:86:0, from /home/kisskb/slave/src/arch/arm/kernel/asm-offsets.c:16: /home/kisskb/slave/src/arch/arm/include/asm/dma-mapping.h: In function 'virt_to_dma': /home/kisskb/slave/src/arch/arm/include/asm/dma-mapping.h:90:1: error: invalid suffix "xUL" on integer constant make[2]: *** [arch/arm/kernel/asm-offsets.s] Error 1 make[1]: *** [prepare0] Error 2 make[1]: *** Waiting for unfinished jobs.... HOSTLD scripts/genksyms/genksyms HOSTLD scripts/mod/modpost make[1]: Leaving directory `/home/kisskb/slave/build/linus_arm-randconfig_arm' make: *** [sub-make] Error 2 Command 'make -j 240 ARCH=arm O=/home/kisskb/slave/build/linus_arm-randconfig_arm CROSS_COMPILE=/opt/cross/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi- ' returned non-zero exit status 2 # rm -rf /home/kisskb/slave/build/linus_arm-randconfig_arm # Build took: 0:00:13.280962