# git rev-parse -q --verify 1bc5e157ed2b4f5b206155fc772d860158acd201^{commit} 1bc5e157ed2b4f5b206155fc772d860158acd201 already have revision, skipping fetch # git checkout -q -f -B kisskb 1bc5e157ed2b4f5b206155fc772d860158acd201 # git clean -qxdf # git log -1 commit 1bc5e157ed2b4f5b206155fc772d860158acd201 Merge: f199b66 657d612 Author: Linus Torvalds Date: Mon Jun 29 09:44:45 2015 -0700 Merge tag 'dmaengine-4.2-rc1' of git://git.infradead.org/users/vkoul/slave-dma Pull dmaengine updates from Vinod Koul: "This time we have support for few new devices, few new features and odd fixes spread thru the subsystem. New devices added: - support for CSRatlas7 dma controller - Allwinner H3(sun8i) controller - TI DMA crossbar driver on DRA7x - new pxa driver New features added: - memset support is bought back now that we have a user in xdmac controller - interleaved transfers support different source and destination strides - supporting DMA routers and configuration thru DT - support for reusing descriptors - xdmac memset and interleaved transfer support - hdmac support for interleaved transfers - omap-dma support for memcpy Others: - Constify platform_device_id - mv_xor fixes and improvements" * tag 'dmaengine-4.2-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (46 commits) dmaengine: xgene: fix file permission dmaengine: fsl-edma: clear pending interrupts on initialization dmaengine: xdmac: Add memset support Documentation: dmaengine: document DMA_CTRL_ACK dmaengine: virt-dma: don't always free descriptor upon completion dmaengine: Revert "drivers/dma: remove unused support for MEMSET operations" dmaengine: hdmac: Implement interleaved transfers dmaengine: Move icg helpers to global header dmaengine: mv_xor: improve descriptors list handling and reduce locking dmaengine: mv_xor: Enlarge descriptor pool size dmaengine: mv_xor: add support for a38x command in descriptor mode dmaengine: mv_xor: Rename function for consistent naming dmaengine: mv_xor: bug fix for racing condition in descriptors cleanup dmaengine: pl330: fix wording in mcbufsz message dmaengine: sirf: add CSRatlas7 SoC support dmaengine: xgene-dma: Fix "incorrect type in assignement" warnings dmaengine: fix kernel-doc documentation dmaengine: pxa_dma: add support for legacy transition dmaengine: pxa_dma: add debug information dmaengine: pxa: add pxa dmaengine driver ... # < /opt/cross/gcc-4.6.3-nolibc/i386-linux/bin/i386-linux-gcc --version # < git log --format=%s --max-count=1 1bc5e157ed2b4f5b206155fc772d860158acd201 # < make -j 240 ARCH=i386 O=/home/kisskb/slave/build/linus_i386-randconfig_i386 CROSS_COMPILE=/opt/cross/gcc-4.6.3-nolibc/i386-linux/bin/i386-linux- randconfig KCONFIG_SEED=0xB1A8CF78 warning: (INTEL_SOC_DTS_IOSF_CORE && PUNIT_ATOM_DEBUG) selects IOSF_MBI which has unmet direct dependencies (PCI) # Added to kconfig CONFIG_STANDALONE=y # yes \n | make -j 240 ARCH=i386 O=/home/kisskb/slave/build/linus_i386-randconfig_i386 CROSS_COMPILE=/opt/cross/gcc-4.6.3-nolibc/i386-linux/bin/i386-linux- oldconfig yes: standard output: Broken pipe yes: write error # make -j 240 ARCH=i386 O=/home/kisskb/slave/build/linus_i386-randconfig_i386 CROSS_COMPILE=/opt/cross/gcc-4.6.3-nolibc/i386-linux/bin/i386-linux- make[1]: Entering directory `/home/kisskb/slave/src' make[2]: Entering directory `/home/kisskb/slave/build/linus_i386-randconfig_i386' GEN ./Makefile scripts/kconfig/conf --silentoldconfig Kconfig warning: (INTEL_SOC_DTS_IOSF_CORE && PUNIT_ATOM_DEBUG) selects IOSF_MBI which has unmet direct dependencies (PCI) warning: (INTEL_SOC_DTS_IOSF_CORE && PUNIT_ATOM_DEBUG) selects IOSF_MBI which has unmet direct dependencies (PCI) make[2]: Leaving directory `/home/kisskb/slave/build/linus_i386-randconfig_i386' make[2]: Entering directory `/home/kisskb/slave/build/linus_i386-randconfig_i386' arch/x86/Makefile:123: stack-protector enabled but compiler support broken /home/kisskb/slave/src/Makefile:663: Cannot use CONFIG_CC_STACKPROTECTOR_STRONG: -fstack-protector-strong not supported by compiler SYSTBL arch/x86/entry/syscalls/../../include/generated/asm/syscalls_32.h SYSHDR arch/x86/entry/syscalls/../../include/generated/uapi/asm/unistd_32.h SYSHDR arch/x86/entry/syscalls/../../include/generated/uapi/asm/unistd_64.h SYSHDR arch/x86/entry/syscalls/../../include/generated/uapi/asm/unistd_x32.h HOSTCC scripts/basic/bin2c CHK include/config/kernel.release UPD include/config/kernel.release GEN ./Makefile WRAP arch/x86/include/generated/asm/cputime.h WRAP arch/x86/include/generated/asm/clkdev.h WRAP arch/x86/include/generated/asm/dma-contiguous.h WRAP arch/x86/include/generated/asm/early_ioremap.h WRAP arch/x86/include/generated/asm/mcs_spinlock.h CHK include/generated/uapi/linux/version.h UPD include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h UPD include/generated/utsrelease.h HOSTCC scripts/kallsyms HOSTCC scripts/pnmtologo HOSTCC scripts/conmakehash HOSTCC scripts/recordmcount HOSTCC scripts/sortextable HOSTCC scripts/asn1_compiler CC scripts/mod/empty.o HOSTCC scripts/mod/mk_elfconfig CC scripts/mod/devicetable-offsets.s cc1: error: unrecognized command line option '-fstack-protector-strong' cc1: error: unrecognized command line option '-fstack-protector-strong' make[4]: *** [scripts/mod/devicetable-offsets.s] Error 1 make[4]: *** Waiting for unfinished jobs.... make[4]: *** [scripts/mod/empty.o] Error 1 make[3]: *** [scripts/mod] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [scripts] Error 2 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory `/home/kisskb/slave/build/linus_i386-randconfig_i386' make[1]: *** [sub-make] Error 2 make[1]: Leaving directory `/home/kisskb/slave/src' Command 'make -j 240 ARCH=i386 O=/home/kisskb/slave/build/linus_i386-randconfig_i386 CROSS_COMPILE=/opt/cross/gcc-4.6.3-nolibc/i386-linux/bin/i386-linux- ' returned non-zero exit status 2 # rm -rf /home/kisskb/slave/build/linus_i386-randconfig_i386 # Build took: 0:00:16.448154