# 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/powerpc-linux/bin/powerpc-linux-gcc --version # < git log --format=%s --max-count=1 3ef2bc099d1cce09e2844467e2ced98e1a44609d # < make -j 10 ARCH=powerpc O=/home/kisskb/slave/build/linus_mpc85xx_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- mpc85xx_defconfig # make -j 10 ARCH=powerpc O=/home/kisskb/slave/build/linus_mpc85xx_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- make[1]: Entering directory '/home/kisskb/slave/build/linus_mpc85xx_defconfig_powerpc' GEN ./Makefile scripts/kconfig/conf --silentoldconfig Kconfig CHK include/config/kernel.release GEN ./Makefile WRAP arch/powerpc/include/generated/asm/div64.h WRAP arch/powerpc/include/generated/asm/clkdev.h WRAP arch/powerpc/include/generated/asm/export.h WRAP arch/powerpc/include/generated/asm/irq_regs.h WRAP arch/powerpc/include/generated/asm/irq_work.h WRAP arch/powerpc/include/generated/asm/mcs_spinlock.h WRAP arch/powerpc/include/generated/asm/local64.h WRAP arch/powerpc/include/generated/asm/preempt.h WRAP arch/powerpc/include/generated/asm/rwsem.h WRAP arch/powerpc/include/generated/asm/vtime.h CHK include/generated/uapi/linux/version.h UPD include/generated/uapi/linux/version.h HOSTCC scripts/basic/bin2c 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/dtc/dtc.o HOSTCC scripts/dtc/flattree.o HOSTCC scripts/dtc/fstree.o HOSTCC scripts/dtc/data.o HOSTCC scripts/dtc/livetree.o HOSTCC scripts/dtc/treesource.o HOSTCC scripts/dtc/srcpos.o HOSTCC scripts/genksyms/genksyms.o CC scripts/mod/empty.o HOSTCC scripts/kallsyms HOSTCC scripts/mod/mk_elfconfig SHIPPED scripts/genksyms/parse.tab.c HOSTCC scripts/dtc/checks.o CC scripts/mod/devicetable-offsets.s MKELF scripts/mod/elfconfig.h SHIPPED scripts/genksyms/lex.lex.c HOSTCC scripts/conmakehash HOSTCC scripts/sortextable HOSTCC scripts/mod/modpost.o GEN scripts/mod/devicetable-offsets.h HOSTCC scripts/dtc/util.o CC kernel/bounds.s CHK include/generated/timeconst.h UPD include/generated/timeconst.h SHIPPED scripts/genksyms/keywords.hash.c SHIPPED scripts/genksyms/parse.tab.h HOSTCC scripts/genksyms/parse.tab.o HOSTCC scripts/genksyms/lex.lex.o CHK include/generated/bounds.h HOSTCC scripts/mod/sumversion.o UPD include/generated/bounds.h CC arch/powerpc/kernel/asm-offsets.s SHIPPED scripts/dtc/dtc-lexer.lex.c HOSTCC scripts/asn1_compiler SHIPPED scripts/dtc/dtc-parser.tab.h SHIPPED scripts/dtc/dtc-parser.tab.c HOSTCC scripts/dtc/dtc-lexer.lex.o HOSTCC scripts/dtc/dtc-parser.tab.o HOSTCC scripts/mod/file2alias.o CHK include/generated/asm-offsets.h UPD include/generated/asm-offsets.h CALL /home/kisskb/slave/src/scripts/checksyscalls.sh HOSTLD scripts/dtc/dtc HOSTLD scripts/genksyms/genksyms 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/initramfs.o UPD include/generated/compile.h CC arch/powerpc/mm/fault.o AS arch/powerpc/lib/string.o CC arch/powerpc/kernel/cputable.o CC arch/powerpc/sysdev/mpic.o CC arch/powerpc/lib/alloc.o GEN usr/initramfs_data.cpio.gz AS usr/initramfs_data.o LD usr/built-in.o AS arch/powerpc/lib/crtsavres.o CC arch/powerpc/lib/code-patching.o CC arch/powerpc/kernel/ptrace.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 CC arch/powerpc/sysdev/mpic_msi.o /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/powerpc/sysdev/mpic_u3msi.o CC arch/powerpc/sysdev/msi_bitmap.o CC arch/powerpc/mm/mem.o CC arch/powerpc/mm/pgtable.o CC arch/powerpc/lib/feature-fixups.o CC arch/powerpc/mm/mmap.o CC arch/powerpc/kernel/syscalls.o CC arch/powerpc/sysdev/fsl_soc.o AS arch/powerpc/lib/div64.o AS arch/powerpc/lib/copy_32.o CC arch/powerpc/mm/init_32.o AS arch/powerpc/lib/checksum_32.o CC arch/powerpc/mm/pgtable_32.o CC arch/powerpc/lib/checksum_wrappers.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/powerpc/sysdev/fsl_mpic_err.o CC arch/powerpc/mm/init-common.o CC arch/powerpc/kernel/irq.o CC arch/powerpc/lib/sstep.o CC arch/powerpc/kernel/align.o CC arch/powerpc/mm/mmu_context_nohash.o CC arch/powerpc/mm/tlb_nohash.o AS arch/powerpc/mm/tlb_nohash_low.o CC arch/powerpc/mm/fsl_booke_mmu.o CC arch/powerpc/mm/hugetlbpage.o CC arch/powerpc/mm/hugetlbpage-book3e.o CC arch/powerpc/sysdev/fsl_pci.o CC arch/powerpc/mm/highmem.o CC arch/powerpc/kernel/signal_32.o AS arch/powerpc/lib/ldstfp.o CC arch/powerpc/kernel/pmc.o CC arch/powerpc/kernel/vdso.o CC arch/powerpc/kernel/process.o CPP arch/powerpc/kernel/systbl_chk.i CC arch/powerpc/lib/rheap.o CC arch/powerpc/sysdev/fsl_msi.o CC arch/powerpc/kernel/idle.o CC arch/powerpc/kernel/signal.o CC arch/powerpc/kernel/sysfs.o CC arch/powerpc/kernel/cacheinfo.o LD arch/powerpc/mm/built-in.o CC arch/powerpc/sysdev/fsl_pmc.o CC arch/powerpc/kernel/time.o CC arch/powerpc/sysdev/fsl_lbc.o CC arch/powerpc/sysdev/fsl_rio.o CC arch/powerpc/kernel/prom.o LD arch/powerpc/lib/built-in.o CC arch/powerpc/sysdev/fsl_rmu.o CC arch/powerpc/kernel/traps.o CC arch/powerpc/sysdev/rtc_cmos_setup.o CC arch/powerpc/kernel/setup-common.o CC arch/powerpc/sysdev/indirect_pci.o CC arch/powerpc/kernel/udbg.o AS arch/powerpc/kernel/misc.o CC arch/powerpc/sysdev/i8259.o CC arch/powerpc/kernel/io.o CC arch/powerpc/kernel/dma.o AS arch/powerpc/kernel/misc_32.o CC arch/powerpc/sysdev/cpm_common.o CC arch/powerpc/sysdev/cpm2.o CC arch/powerpc/kernel/of_platform.o CC arch/powerpc/kernel/prom_parse.o CC arch/powerpc/kernel/trace/trace_clock.o LDS arch/powerpc/kernel/vdso32/vdso32.lds VDSO32A arch/powerpc/kernel/vdso32/sigtramp.o CC arch/powerpc/kernel/proc_powerpc.o LD arch/powerpc/kernel/trace/built-in.o VDSO32A arch/powerpc/kernel/vdso32/gettimeofday.o VDSO32A arch/powerpc/kernel/vdso32/datapage.o VDSO32A arch/powerpc/kernel/vdso32/cacheflush.o AS arch/powerpc/kernel/idle_e500.o VDSO32A arch/powerpc/kernel/vdso32/note.o VDSO32L arch/powerpc/kernel/vdso32/vdso32.so.dbg CC arch/powerpc/kernel/module.o OBJCOPY arch/powerpc/kernel/vdso32/vdso32.so AS arch/powerpc/kernel/vdso32/vdso32_wrapper.o LD arch/powerpc/kernel/vdso32/built-in.o CC arch/powerpc/kernel/module_32.o AS arch/powerpc/kernel/cpu_setup_fsl_booke.o CC arch/powerpc/kernel/dbell.o AS arch/powerpc/kernel/entry_32.o CC arch/powerpc/kernel/setup_32.o CC arch/powerpc/sysdev/cpm2_pic.o CC arch/powerpc/kernel/uprobes.o CC arch/powerpc/kernel/legacy_serial.o CC arch/powerpc/kernel/udbg_16550.o CC arch/powerpc/kernel/stacktrace.o CC arch/powerpc/kernel/dma-swiotlb.o CC arch/powerpc/kernel/pci_32.o CC arch/powerpc/kernel/pci-common.o CC arch/powerpc/kernel/pci_of_scan.o LD arch/powerpc/sysdev/built-in.o CC arch/powerpc/kernel/msi.o CC arch/powerpc/kernel/machine_kexec.o CC arch/powerpc/kernel/crash.o CC arch/powerpc/kernel/machine_kexec_32.o CC arch/powerpc/kernel/audit.o CC arch/powerpc/kernel/iomap.o AS arch/powerpc/kernel/ppc_save_regs.o CC arch/powerpc/kernel/epapr_paravirt.o AS arch/powerpc/kernel/epapr_hcalls.o AS arch/powerpc/kernel/head_fsl_booke.o LDS arch/powerpc/kernel/vmlinux.lds CALL /home/kisskb/slave/src/arch/powerpc/kernel/systbl_chk.sh AS arch/powerpc/kernel/systbl.o LD arch/powerpc/kernel/built-in.o make[1]: Leaving directory '/home/kisskb/slave/build/linus_mpc85xx_defconfig_powerpc' Makefile:152: recipe for target 'sub-make' failed make: *** [sub-make] Error 2 Command 'make -j 10 ARCH=powerpc O=/home/kisskb/slave/build/linus_mpc85xx_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- ' returned non-zero exit status 2 # rm -rf /home/kisskb/slave/build/linus_mpc85xx_defconfig_powerpc # Build took: 0:00:15.246731