# git rev-parse -q --verify dad4f140edaa3f6bb452b6913d41af1ffd672e45^{commit} dad4f140edaa3f6bb452b6913d41af1ffd672e45 already have revision, skipping fetch # git checkout -q -f -B kisskb dad4f140edaa3f6bb452b6913d41af1ffd672e45 # git clean -qxdf # < git log -1 # commit dad4f140edaa3f6bb452b6913d41af1ffd672e45 # Merge: 69d5b97c5973 3a08cd52c37c # Author: Linus Torvalds # Date: Sun Oct 28 11:35:40 2018 -0700 # # Merge branch 'xarray' of git://git.infradead.org/users/willy/linux-dax # # Pull XArray conversion from Matthew Wilcox: # "The XArray provides an improved interface to the radix tree data # structure, providing locking as part of the API, specifying GFP flags # at allocation time, eliminating preloading, less re-walking the tree, # more efficient iterations and not exposing RCU-protected pointers to # its users. # # This patch set # # 1. Introduces the XArray implementation # # 2. Converts the pagecache to use it # # 3. Converts memremap to use it # # The page cache is the most complex and important user of the radix # tree, so converting it was most important. Converting the memremap # code removes the only other user of the multiorder code, which allows # us to remove the radix tree code that supported it. # # I have 40+ followup patches to convert many other users of the radix # tree over to the XArray, but I'd like to get this part in first. The # other conversions haven't been in linux-next and aren't suitable for # applying yet, but you can see them in the xarray-conv branch if you're # interested" # # * 'xarray' of git://git.infradead.org/users/willy/linux-dax: (90 commits) # radix tree: Remove multiorder support # radix tree test: Convert multiorder tests to XArray # radix tree tests: Convert item_delete_rcu to XArray # radix tree tests: Convert item_kill_tree to XArray # radix tree tests: Move item_insert_order # radix tree test suite: Remove multiorder benchmarking # radix tree test suite: Remove __item_insert # memremap: Convert to XArray # xarray: Add range store functionality # xarray: Move multiorder_check to in-kernel tests # xarray: Move multiorder_shrink to kernel tests # xarray: Move multiorder account test in-kernel # radix tree test suite: Convert iteration test to XArray # radix tree test suite: Convert tag_tagged_items to XArray # radix tree: Remove radix_tree_clear_tags # radix tree: Remove radix_tree_maybe_preload_order # radix tree: Remove split/join code # radix tree: Remove radix_tree_update_node_t # page cache: Finish XArray conversion # dax: Convert page fault handlers to XArray # ... # < /opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux-gcc --version # < git log --format=%s --max-count=1 dad4f140edaa3f6bb452b6913d41af1ffd672e45 # < make -s -j 80 ARCH=powerpc O=/kisskb/build/linus_ppc64_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- ppc64_defconfig # make -s -j 80 ARCH=powerpc O=/kisskb/build/linus_ppc64_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- /kisskb/src/kernel/cgroup/cgroup-v1.c: In function 'cgroup1_mount': /kisskb/src/kernel/cgroup/cgroup-v1.c:1256:20: warning: 'root' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/kernel/printk/printk.c: In function 'devkmsg_sysctl_set_loglvl': /kisskb/src/kernel/printk/printk.c:187:16: warning: 'old' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/mm/hugetlb.c: In function 'alloc_pool_huge_page': /kisskb/src/mm/hugetlb.c:1433:5: warning: 'page' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/net/bridge/br_netlink.c: In function 'br_afspec': /kisskb/src/net/bridge/br_netlink.c:647:7: warning: 'err' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/net/bridge/br_multicast.c: In function 'br_multicast_query_received': /kisskb/src/net/bridge/br_multicast.c:1432:31: error: 'union ' has no member named 'ip6' make[3]: *** [/kisskb/src/scripts/Makefile.build:305: net/bridge/br_multicast.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:546: net/bridge] Error 2 make[2]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/base/regmap/regmap.c: In function 'regmap_raw_read': /kisskb/src/drivers/base/regmap/regmap.c:2594:6: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/base/regmap/regmap.c: In function '_regmap_raw_write': /kisskb/src/drivers/base/regmap/regmap.c:1855:6: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] make[1]: *** [/kisskb/src/Makefile:1052: net] Error 2 make[1]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/i2c/i2c-core-base.c: In function 'i2c_generic_scl_recovery': /kisskb/src/drivers/i2c/i2c-core-base.c:235:5: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c: In function 'proc_reg_open': /kisskb/src/include/linux/list.h:65:12: warning: 'pdeo' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c:341:21: note: 'pdeo' was declared here /kisskb/src/drivers/tty/serial/8250/8250_core.c: In function 'univ8250_release_irq': /kisskb/src/drivers/tty/serial/8250/8250_core.c:251:18: warning: 'i' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/tty/serial/8250/8250_core.c:231:19: note: 'i' was declared here /kisskb/src/fs/udf/unicode.c: In function 'udf_name_conv_char': /kisskb/src/fs/udf/unicode.c:132:8: warning: 'c' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/nfsd/nfs4xdr.c: In function 'nfsd4_encode_components_esc': /kisskb/src/fs/nfsd/nfs4xdr.c:2069:9: warning: 'str' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/ethernet/mellanox/mlx4/en_rx.c:582:18: warning: 'struct iphdr' declared inside parameter list [enabled by default] /kisskb/src/drivers/net/ethernet/mellanox/mlx4/en_rx.c:582:18: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] /kisskb/src/drivers/net/ethernet/mellanox/mlx4/en_rx.c: In function 'get_fixed_ipv4_csum': /kisskb/src/drivers/net/ethernet/mellanox/mlx4/en_rx.c:586:20: error: dereferencing pointer to incomplete type /kisskb/src/drivers/net/ethernet/mellanox/mlx4/en_rx.c:591:21: error: dereferencing pointer to incomplete type /kisskb/src/drivers/net/ethernet/mellanox/mlx4/en_rx.c:591:53: error: dereferencing pointer to incomplete type /kisskb/src/drivers/net/ethernet/mellanox/mlx4/en_rx.c:592:45: error: dereferencing pointer to incomplete type /kisskb/src/drivers/net/ethernet/mellanox/mlx4/en_rx.c:592:57: error: dereferencing pointer to incomplete type make[6]: *** [/kisskb/src/scripts/Makefile.build:305: drivers/net/ethernet/mellanox/mlx4/en_rx.o] Error 1 make[6]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/net/tun.c: In function 'tun_get_user': /kisskb/src/drivers/net/tun.c:1819:30: warning: 'copylen' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/tun.c:1729:46: warning: 'linear' may be used uninitialized in this function [-Wuninitialized] make[5]: *** [/kisskb/src/scripts/Makefile.build:546: drivers/net/ethernet/mellanox/mlx4] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:546: drivers/net/ethernet/mellanox] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:546: drivers/net/ethernet] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:546: drivers/net] Error 2 make[1]: *** [/kisskb/src/Makefile:1052: drivers] Error 2 make: *** [Makefile:146: sub-make] Error 2 Command 'make -s -j 80 ARCH=powerpc O=/kisskb/build/linus_ppc64_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 /kisskb/build/linus_ppc64_defconfig_powerpc # Build took: 0:02:03.593981