# 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/or1k-linux-5.4.0-20170218/or1k-linux/bin/or1k-linux-gcc --version # < git log --format=%s --max-count=1 dad4f140edaa3f6bb452b6913d41af1ffd672e45 # < make -s -j 10 ARCH=openrisc O=/kisskb/build/linus_or1ksim_defconfig_or32 CROSS_COMPILE=/opt/cross/kisskb/or1k-linux-5.4.0-20170218/or1k-linux/bin/or1k-linux- or1ksim_defconfig # make -s -j 10 ARCH=openrisc O=/kisskb/build/linus_or1ksim_defconfig_or32 CROSS_COMPILE=/opt/cross/kisskb/or1k-linux-5.4.0-20170218/or1k-linux/bin/or1k-linux- Completed OK # rm -rf /kisskb/build/linus_or1ksim_defconfig_or32 # Build took: 0:00:48.256503