# git rev-parse -q --verify 3ef2bc099d1cce09e2844467e2ced98e1a44609d^{commit} 3ef2bc099d1cce09e2844467e2ced98e1a44609d already have revision, skipping fetch # git checkout -q -f -B kisskb 3ef2bc099d1cce09e2844467e2ced98e1a44609d # git clean -qxdf # git log -1 commit 3ef2bc099d1cce09e2844467e2ced98e1a44609d Merge: 2eecf3a 17a7035 Author: Linus Torvalds Date: Fri May 5 19:33:07 2017 -0700 Merge tag 'devicetree-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux Pull DeviceTree updates from Rob Herring: - fix sparse warnings in drivers/of/ - add more overlay unittests - update dtc to v1.4.4-8-g756ffc4f52f6. This adds more checks on dts files such as unit-address formatting and stricter character sets for node and property names - add a common DT modalias function - move trivial-devices.txt up and out of i2c dir - ARM NVIC interrupt controller binding - vendor prefixes for Sensirion, Dioo, Nordic, ROHM - correct some binding file locations * tag 'devicetree-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (24 commits) of: fix sparse warnings in fdt, irq, reserved mem, and resolver code of: fix sparse warning in of_pci_range_parser_one of: fix sparse warnings in of_find_next_cache_node of/unittest: Missing unlocks on error of: fix uninitialized variable warning for overlay test of: fix unittest build without CONFIG_OF_OVERLAY of: Add unit tests for applying overlays of: per-file dtc compiler flags fpga: region: add missing DT documentation for config complete timeout of: Add vendor prefix for ROHM Semiconductor of: fix "/cpus" reference leak in of_numa_parse_cpu_nodes() of: Add vendor prefix for Nordic Semiconductor dt-bindings: arm,nvic: Binding for ARM NVIC interrupt controller on Cortex-M dtc: update warning settings for new bus and node/property name checks scripts/dtc: Update to upstream version v1.4.4-8-g756ffc4f52f6 scripts/dtc: automate getting dtc version and log in update script of: Add function for generating a DT modalias with a newline of: fix of_device_get_modalias returned length when truncating buffers Documentation: devicetree: move trivial-devices out of I2C realm dt-bindings: add vendor prefix for Dioo .. # < /opt/cross/kisskb/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi-gcc --version # < git log --format=%s --max-count=1 3ef2bc099d1cce09e2844467e2ced98e1a44609d # < make -j 10 ARCH=arm O=/home/kisskb/slave/build/linus_iop33x_defconfig_arm CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi- iop33x_defconfig # make -j 10 ARCH=arm O=/home/kisskb/slave/build/linus_iop33x_defconfig_arm CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi- make[1]: Entering directory '/home/kisskb/slave/build/linus_iop33x_defconfig_arm' GEN ./Makefile scripts/kconfig/conf --silentoldconfig Kconfig CHK include/config/kernel.release SYSHDR arch/arm/include/generated/uapi/asm/unistd-common.h SYSHDR arch/arm/include/generated/uapi/asm/unistd-oabi.h SYSHDR arch/arm/include/generated/uapi/asm/unistd-eabi.h GEN ./Makefile WRAP arch/arm/include/generated/asm/bitsperlong.h WRAP arch/arm/include/generated/asm/clkdev.h WRAP arch/arm/include/generated/asm/current.h WRAP arch/arm/include/generated/asm/early_ioremap.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 WRAP arch/arm/include/generated/asm/extable.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 WRAP arch/arm/include/generated/asm/local.h WRAP arch/arm/include/generated/asm/local64.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/msi.h WRAP arch/arm/include/generated/asm/param.h WRAP arch/arm/include/generated/asm/parport.h CHK include/generated/uapi/linux/version.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 UPD include/generated/uapi/linux/version.h WRAP arch/arm/include/generated/asm/seccomp.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/sizes.h WRAP arch/arm/include/generated/asm/socket.h WRAP arch/arm/include/generated/asm/sockios.h WRAP arch/arm/include/generated/asm/termbits.h WRAP arch/arm/include/generated/asm/termios.h WRAP arch/arm/include/generated/asm/timex.h WRAP arch/arm/include/generated/asm/unaligned.h WRAP arch/arm/include/generated/asm/trace_clock.h UPD include/config/kernel.release Using /home/kisskb/slave/src as source for kernel CHK include/generated/utsrelease.h UPD include/generated/utsrelease.h HOSTCC scripts/kallsyms CC scripts/mod/empty.o HOSTCC scripts/mod/mk_elfconfig HOSTCC scripts/conmakehash CC scripts/mod/devicetable-offsets.s HOSTCC scripts/sortextable GEN scripts/mod/devicetable-offsets.h MKELF scripts/mod/elfconfig.h HOSTCC scripts/mod/modpost.o HOSTCC scripts/mod/file2alias.o HOSTCC scripts/mod/sumversion.o SYSNR arch/arm/include/generated/asm/unistd-nr.h GEN arch/arm/include/generated/asm/mach-types.h SYSTBL arch/arm/include/generated/calls-oabi.S SYSTBL arch/arm/include/generated/calls-eabi.S 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 CHK include/generated/asm-offsets.h UPD include/generated/asm-offsets.h CALL /home/kisskb/slave/src/scripts/checksyscalls.sh HOSTLD scripts/mod/modpost HOSTCC usr/gen_init_cpio CC init/main.o CHK include/generated/compile.h CC init/do_mounts.o CC init/do_mounts_rd.o CC init/do_mounts_initrd.o CC init/do_mounts_md.o CC arch/arm/nwfpe/fpa11.o UPD include/generated/compile.h CC arch/arm/nwfpe/fpa11_cpdo.o CC arch/arm/kernel/elf.o CC arch/arm/mm/dma-mapping.o CC arch/arm/mm/extable.o CC arch/arm/nwfpe/fpa11_cpdt.o AS arch/arm/kernel/entry-common.o CC arch/arm/mm/fault.o CC arch/arm/kernel/irq.o GEN usr/initramfs_data.cpio.gz AS usr/initramfs_data.o LD usr/built-in.o CC arch/arm/mm/init.o CC arch/arm/mm/iomap.o CC arch/arm/nwfpe/fpa11_cprt.o CC arch/arm/mm/fault-armv.o CC arch/arm/nwfpe/fpmodule.o CC arch/arm/kernel/opcodes.o CC init/initramfs.o CC init/calibrate.o CC arch/arm/nwfpe/fpopcode.o CC arch/arm/kernel/process.o CC arch/arm/mm/flush.o CC arch/arm/mm/idmap.o CC arch/arm/common/firmware.o CC arch/arm/nwfpe/softfloat.o CC arch/arm/mm/ioremap.o CC arch/arm/mm/mmap.o CC init/init_task.o CC arch/arm/mm/pgd.o /home/kisskb/slave/src/init/initramfs.c: In function 'populate_rootfs': /home/kisskb/slave/src/init/initramfs.c:644:2: error: label at end of compound statement /home/kisskb/slave/src/scripts/Makefile.build:294: recipe for target 'init/initramfs.o' failed make[2]: *** [init/initramfs.o] Error 1 make[2]: *** Waiting for unfinished jobs.... CC arch/arm/mm/mmu.o LD arch/arm/common/built-in.o CC arch/arm/mm/pageattr.o CC arch/arm/kernel/ptrace.o CC arch/arm/kernel/reboot.o CC arch/arm/kernel/return_address.o /home/kisskb/slave/src/Makefile:1002: recipe for target 'init' failed make[1]: *** [init] Error 2 make[1]: *** Waiting for unfinished jobs.... CC arch/arm/kernel/setup.o CC arch/arm/mm/proc-syms.o CC arch/arm/kernel/signal.o CC arch/arm/mm/alignment.o AS arch/arm/kernel/sigreturn_codes.o AS arch/arm/mm/abort-ev5t.o AS arch/arm/mm/pabort-legacy.o CC arch/arm/kernel/stacktrace.o CC arch/arm/nwfpe/single_cpdo.o CC arch/arm/mm/copypage-xscale.o CC arch/arm/nwfpe/double_cpdo.o CC arch/arm/kernel/sys_arm.o AS arch/arm/mm/tlb-v4wbi.o CC arch/arm/kernel/time.o CC arch/arm/kernel/traps.o CC arch/arm/kernel/atags_parse.o AS arch/arm/nwfpe/entry.o AS arch/arm/kernel/entry-armv.o CC arch/arm/kernel/armksyms.o LD arch/arm/nwfpe/nwfpe.o LD arch/arm/nwfpe/built-in.o CC arch/arm/kernel/module.o AS arch/arm/mm/proc-xscale.o CC arch/arm/kernel/bios32.o CC arch/arm/kernel/isa.o AS arch/arm/kernel/sleep.o CC arch/arm/kernel/suspend.o LD arch/arm/mm/built-in.o CC arch/arm/kernel/xscale-cp0.o CC arch/arm/kernel/io.o AS arch/arm/kernel/debug.o AS arch/arm/kernel/head.o LDS arch/arm/kernel/vmlinux.lds LD arch/arm/kernel/built-in.o make[1]: Leaving directory '/home/kisskb/slave/build/linus_iop33x_defconfig_arm' Makefile:152: recipe for target 'sub-make' failed make: *** [sub-make] Error 2 Command 'make -j 10 ARCH=arm O=/home/kisskb/slave/build/linus_iop33x_defconfig_arm CROSS_COMPILE=/opt/cross/kisskb/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_iop33x_defconfig_arm # Build took: 0:00:09.151567