# 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/arcompact-buildroot-2015.08.1/bin/arc-buildroot-linux-uclibc-gcc --version # < git log --format=%s --max-count=1 dad4f140edaa3f6bb452b6913d41af1ffd672e45 # < make -s -j 48 ARCH=arc O=/kisskb/build/linus_axs101_defconfig_arcompact CROSS_COMPILE=/opt/cross/kisskb/arcompact-buildroot-2015.08.1/bin/arc-buildroot-linux-uclibc- axs101_defconfig # Added to kconfig CONFIG_INITRAMFS_SOURCE="" # yes \n | make -s -j 48 ARCH=arc O=/kisskb/build/linus_axs101_defconfig_arcompact CROSS_COMPILE=/opt/cross/kisskb/arcompact-buildroot-2015.08.1/bin/arc-buildroot-linux-uclibc- oldconfig yes: standard output: Broken pipe # make -s -j 48 ARCH=arc O=/kisskb/build/linus_axs101_defconfig_arcompact CROSS_COMPILE=/opt/cross/kisskb/arcompact-buildroot-2015.08.1/bin/arc-buildroot-linux-uclibc- arch/arc/boot/dts/axs101.dtb: Warning (i2c_bus_reg): /axs10x_mb/i2c@0x1f000/eeprom@0x54: I2C bus unit address format error, expected "54" arch/arc/boot/dts/axs101.dtb: Warning (i2c_bus_reg): /axs10x_mb/i2c@0x1f000/eeprom@0x57: I2C bus unit address format error, expected "57" In file included from /kisskb/src/include/asm-generic/bug.h:18:0, from /kisskb/src/arch/arc/include/asm/bug.h:32, from /kisskb/src/include/linux/bug.h:5, from /kisskb/src/include/linux/mmdebug.h:5, from /kisskb/src/include/linux/gfp.h:5, from /kisskb/src/include/linux/slab.h:15, from /kisskb/src/mm/nobootmem.c:14: /kisskb/src/mm/nobootmem.c: In function '__free_pages_memory': /kisskb/src/include/linux/kernel.h:845:29: warning: comparison of distinct pointer types lacks a cast [enabled by default] (!!(sizeof((typeof(x) *)1 == (typeof(y) *)1))) ^ /kisskb/src/include/linux/kernel.h:859:4: note: in expansion of macro '__typecheck' (__typecheck(x, y) && __no_side_effects(x, y)) ^ /kisskb/src/include/linux/kernel.h:869:24: note: in expansion of macro '__safe_cmp' __builtin_choose_expr(__safe_cmp(x, y), \ ^ /kisskb/src/include/linux/kernel.h:878:19: note: in expansion of macro '__careful_cmp' #define min(x, y) __careful_cmp(x, y, <) ^ /kisskb/src/mm/nobootmem.c:104:11: note: in expansion of macro 'min' order = min(MAX_ORDER - 1UL, __ffs(start)); ^ In file included from /kisskb/src/arch/arc/include/asm/atomic.h:16:0, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/include/asm-generic/bitops/lock.h:5, from /kisskb/src/arch/arc/include/asm/bitops.h:429, from /kisskb/src/include/linux/bitops.h:19, from /kisskb/src/include/linux/kernel.h:11, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/module.h:9, from /kisskb/src/net/core/filter.c:24: /kisskb/src/net/core/filter.c: In function 'bpf_clear_redirect_map': /kisskb/src/arch/arc/include/asm/cmpxchg.h:95:29: warning: value computed is not used [-Wunused-value] #define cmpxchg(ptr, o, n) ((typeof(*(ptr)))__cmpxchg((ptr), \ ^ /kisskb/src/net/core/filter.c:3304:4: note: in expansion of macro 'cmpxchg' cmpxchg(&ri->map, map, NULL); ^ /kisskb/src/net/ipv4/tcp_input.c: In function 'tcp_data_queue': /kisskb/src/net/ipv4/tcp_input.c:4311:49: warning: array subscript is above array bounds [-Warray-bounds] tp->selective_acks[i-1] = tp->selective_acks[i]; ^ Completed OK # rm -rf /kisskb/build/linus_axs101_defconfig_arcompact # Build took: 0:00:49.317108