# git rev-parse -q --verify 4a3bb4200a5958d76cc26ebe4db4257efa56812b^{commit} 4a3bb4200a5958d76cc26ebe4db4257efa56812b already have revision, skipping fetch # git checkout -q -f -B kisskb 4a3bb4200a5958d76cc26ebe4db4257efa56812b # git clean -qxdf # < git log -1 # commit 4a3bb4200a5958d76cc26ebe4db4257efa56812b # Merge: eceae1e7acae c1dec343d7ab # Author: Linus Torvalds # Date: Thu Sep 2 10:32:06 2021 -0700 # # Merge tag 'dma-mapping-5.15' of git://git.infradead.org/users/hch/dma-mapping # # Pull dma-mapping updates from Christoph Hellwig: # # - fix debugfs initialization order (Anthony Iliopoulos) # # - use memory_intersects() directly (Kefeng Wang) # # - allow to return specific errors from ->map_sg (Logan Gunthorpe, # Martin Oliveira) # # - turn the dma_map_sg return value into an unsigned int (me) # # - provide a common global coherent pool Ń–mplementation (me) # # * tag 'dma-mapping-5.15' of git://git.infradead.org/users/hch/dma-mapping: (31 commits) # hexagon: use the generic global coherent pool # dma-mapping: make the global coherent pool conditional # dma-mapping: add a dma_init_global_coherent helper # dma-mapping: simplify dma_init_coherent_memory # dma-mapping: allow using the global coherent pool for !ARM # ARM/nommu: use the generic dma-direct code for non-coherent devices # dma-direct: add support for dma_coherent_default_memory # dma-mapping: return an unsigned int from dma_map_sg{,_attrs} # dma-mapping: disallow .map_sg operations from returning zero on error # dma-mapping: return error code from dma_dummy_map_sg() # x86/amd_gart: don't set failed sg dma_address to DMA_MAPPING_ERROR # x86/amd_gart: return error code from gart_map_sg() # xen: swiotlb: return error code from xen_swiotlb_map_sg() # parisc: return error code from .map_sg() ops # sparc/iommu: don't set failed sg dma_address to DMA_MAPPING_ERROR # sparc/iommu: return error codes from .map_sg() ops # s390/pci: don't set failed sg dma_address to DMA_MAPPING_ERROR # s390/pci: return error code from s390_dma_map_sg() # powerpc/iommu: don't set failed sg dma_address to DMA_MAPPING_ERROR # powerpc/iommu: return error code from .map_sg() ops # ... # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/s390-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/s390-linux-ld --version # < git log --format=%s --max-count=1 4a3bb4200a5958d76cc26ebe4db4257efa56812b # < make -s -j 48 ARCH=s390 O=/kisskb/build/linus_s390-defconfig_s390x-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/s390-linux- defconfig # < make -s -j 48 ARCH=s390 O=/kisskb/build/linus_s390-defconfig_s390x-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/s390-linux- help # make -s -j 48 ARCH=s390 O=/kisskb/build/linus_s390-defconfig_s390x-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/s390-linux- olddefconfig # make -s -j 48 ARCH=s390 O=/kisskb/build/linus_s390-defconfig_s390x-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/s390-linux/bin/s390-linux- /kisskb/src/net/sched/sch_frag.c: In function 'sch_fragment': /kisskb/src/net/sched/sch_frag.c:93:10: warning: missing braces around initializer [-Wmissing-braces] struct rtable sch_frag_rt = { 0 }; ^ /kisskb/src/net/sched/sch_frag.c:93:10: warning: (near initialization for 'sch_frag_rt.dst') [-Wmissing-braces] /kisskb/src/security/landlock/ruleset.c: In function 'insert_rule': /kisskb/src/security/landlock/ruleset.c:196:34: warning: passing argument 2 of 'create_rule' from incompatible pointer type new_rule = create_rule(object, &this->layers, this->num_layers, ^ /kisskb/src/security/landlock/ruleset.c:69:30: note: expected 'const struct landlock_layer (* const)[]' but argument is of type 'struct landlock_layer (*)[]' static struct landlock_rule *create_rule( ^ /kisskb/src/security/landlock/ruleset.c: In function 'landlock_insert_rule': /kisskb/src/security/landlock/ruleset.c:240:38: warning: passing argument 3 of 'insert_rule' from incompatible pointer type return insert_rule(ruleset, object, &layers, ARRAY_SIZE(layers)); ^ /kisskb/src/security/landlock/ruleset.c:144:12: note: expected 'const struct landlock_layer (* const)[]' but argument is of type 'struct landlock_layer (*)[1]' static int insert_rule(struct landlock_ruleset *const ruleset, ^ /kisskb/src/security/landlock/ruleset.c: In function 'merge_ruleset': /kisskb/src/security/landlock/ruleset.c:300:47: warning: passing argument 3 of 'insert_rule' from incompatible pointer type err = insert_rule(dst, walker_rule->object, &layers, ^ /kisskb/src/security/landlock/ruleset.c:144:12: note: expected 'const struct landlock_layer (* const)[]' but argument is of type 'struct landlock_layer (*)[1]' static int insert_rule(struct landlock_ruleset *const ruleset, ^ /kisskb/src/security/landlock/ruleset.c: In function 'inherit_ruleset': /kisskb/src/security/landlock/ruleset.c:330:5: warning: passing argument 3 of 'insert_rule' from incompatible pointer type &walker_rule->layers, walker_rule->num_layers); ^ /kisskb/src/security/landlock/ruleset.c:144:12: note: expected 'const struct landlock_layer (* const)[]' but argument is of type 'struct landlock_layer (*)[]' static int insert_rule(struct landlock_ruleset *const ruleset, ^ /kisskb/src/net/openvswitch/actions.c: In function 'ovs_fragment': /kisskb/src/net/openvswitch/actions.c:831:10: warning: missing braces around initializer [-Wmissing-braces] struct rtable ovs_rt = { 0 }; ^ /kisskb/src/net/openvswitch/actions.c:831:10: warning: (near initialization for 'ovs_rt.dst') [-Wmissing-braces] /kisskb/src/fs/btrfs/tree-checker.c: In function 'check_root_item': /kisskb/src/fs/btrfs/tree-checker.c:1089:9: warning: missing braces around initializer [-Wmissing-braces] struct btrfs_root_item ri = { 0 }; ^ /kisskb/src/fs/btrfs/tree-checker.c:1089:9: warning: (near initialization for 'ri.inode') [-Wmissing-braces] /kisskb/src/fs/cifs/connect.c: In function 'cifs_mount': /kisskb/src/fs/cifs/connect.c:3466:2: warning: missing braces around initializer [-Wmissing-braces] uuid_t mount_id = {0}; ^ /kisskb/src/fs/cifs/connect.c:3466:2: warning: (near initialization for 'mount_id.b') [-Wmissing-braces] Completed OK # rm -rf /kisskb/build/linus_s390-defconfig_s390x-gcc4.9 # Build took: 0:04:12.554365