# git rev-parse -q --verify cff229491af5df946781edfbeafd43e9cf66a3b4^{commit} cff229491af5df946781edfbeafd43e9cf66a3b4 already have revision, skipping fetch # git checkout -q -f -B kisskb cff229491af5df946781edfbeafd43e9cf66a3b4 # git clean -qxdf # < git log -1 # commit cff229491af5df946781edfbeafd43e9cf66a3b4 # Merge: 13775dacca5c b9fd04262a8a # Author: Linus Torvalds # Date: Mon Oct 22 18:16:03 2018 +0100 # # Merge tag 'dma-mapping-4.20' of git://git.infradead.org/users/hch/dma-mapping # # Pull dma mapping updates from Christoph Hellwig: # "First batch of dma-mapping changes for 4.20. # # There will be a second PR as some big changes were only applied just # before the end of the merge window, and I want to give them a few more # days in linux-next. # # Summary: # # - mostly more consolidation of the direct mapping code, including # converting over hexagon, and merging the coherent and non-coherent # code into a single dma_map_ops instance (me) # # - cleanups for the dma_configure/dma_unconfigure callchains (me) # # - better handling of dma_masks in odd setups (me, Alexander Duyck) # # - better debugging of passing vmalloc address to the DMA API (Stephen # Boyd) # # - CMA command line parsing fix (He Zhe)" # # * tag 'dma-mapping-4.20' of git://git.infradead.org/users/hch/dma-mapping: (27 commits) # dma-direct: respect DMA_ATTR_NO_WARN # dma-mapping: translate __GFP_NOFAIL to DMA_ATTR_NO_WARN # dma-direct: document the zone selection logic # dma-debug: Check for drivers mapping invalid addresses in dma_map_single() # dma-direct: fix return value of dma_direct_supported # dma-mapping: move dma_default_get_required_mask under ifdef # dma-direct: always allow dma mask <= physiscal memory size # dma-direct: implement complete bus_dma_mask handling # dma-direct: refine dma_direct_alloc zone selection # dma-direct: add an explicit dma_direct_get_required_mask # dma-mapping: make the get_required_mask method available unconditionally # unicore32: remove swiotlb support # Revert "dma-mapping: clear dev->dma_ops in arch_teardown_dma_ops" # dma-mapping: support non-coherent devices in dma_common_get_sgtable # dma-mapping: consolidate the dma mmap implementations # dma-mapping: merge direct and noncoherent ops # dma-mapping: move the dma_coherent flag to struct device # MIPS: don't select DMA_MAYBE_COHERENT from DMA_PERDEV_COHERENT # dma-mapping: add the missing ARCH_HAS_SYNC_DMA_FOR_CPU_ALL declaration # dma-mapping: fix panic caused by passing empty cma command line argument # ... # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < git log --format=%s --max-count=1 cff229491af5df946781edfbeafd43e9cf66a3b4 # < make -s -j 8 ARCH=mips O=/kisskb/build/linus_mips-defconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- defconfig # make -s -j 8 ARCH=mips O=/kisskb/build/linus_mips-defconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- FIT description: Linux 4.19.0-gcff229491af5 Created: Tue Oct 23 14:30:43 2018 Image 0 (kernel@0) Description: Linux 4.19.0-gcff229491af5 Created: Tue Oct 23 14:30:43 2018 Type: Kernel Image Compression: gzip compressed Data Size: 4435881 Bytes = 4331.92 KiB = 4.23 MiB Architecture: MIPS OS: Linux Load Address: 0x80100000 Entry Point: 0x80843310 Hash algo: sha1 Hash value: 80e0c7293515a3a22f632683c844d4dab76d2cd6 Image 1 (fdt@boston) Description: img,boston Device Tree Created: Tue Oct 23 14:30:43 2018 Type: Flat Device Tree Compression: uncompressed Data Size: 3668 Bytes = 3.58 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 569c37cc891ce1e1f3a193cb41cc691a5d2debb5 Image 2 (fdt@ni169445) Description: NI 169445 device tree Created: Tue Oct 23 14:30:43 2018 Type: Flat Device Tree Compression: uncompressed Data Size: 1871 Bytes = 1.83 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 51b89b31605ee62038c8468c429af091dfc75ec7 Image 3 (fdt@xilfpga) Description: MIPSfpga (xilfpga) Device Tree Created: Tue Oct 23 14:30:43 2018 Type: Flat Device Tree Compression: uncompressed Data Size: 2708 Bytes = 2.64 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 509ce58e44c561d54539e64e9d4b47054e696fc6 Default Configuration: 'conf@default' Configuration 0 (conf@default) Description: Generic Linux kernel Kernel: kernel@0 Configuration 1 (conf@boston) Description: Boston Linux kernel Kernel: kernel@0 FDT: fdt@boston Configuration 2 (conf@ni169445) Description: NI 169445 Linux Kernel Kernel: kernel@0 FDT: fdt@ni169445 Configuration 3 (conf@xilfpga) Description: MIPSfpga Linux kernel Kernel: kernel@0 FDT: fdt@xilfpga Completed OK # rm -rf /kisskb/build/linus_mips-defconfig_mips-gcc8 # Build took: 0:03:27.467835