From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Dec 2018 00:35:58 +0000 (-0800)
Subject: Merge tag 'xarray-4.20-rc7' of git://git.infradead.org/users/willy/linux-dax
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=880b9df1bf157dc28a2e65beea6183d095e0ccb0;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'xarray-4.20-rc7' of git://git.infradead.org/users/willy/linux-dax

Pull XArray fixes from Matthew Wilcox:
 "Two bugfixes, each with test-suite updates, two improvements to the
  test-suite without associated bugs, and one patch adding a missing
  API"

* tag 'xarray-4.20-rc7' of git://git.infradead.org/users/willy/linux-dax:
  XArray: Fix xa_alloc when id exceeds max
  XArray tests: Check iterating over multiorder entries
  XArray tests: Handle larger indices more elegantly
  XArray: Add xa_cmpxchg_irq and xa_cmpxchg_bh
  radix tree: Don't return retry entries from lookup
---

880b9df1bf157dc28a2e65beea6183d095e0ccb0