From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Jan 2019 04:08:30 +0000 (+1300)
Subject: Merge tag 'xarray-5.0-rc3' of git://git.infradead.org/users/willy/linux-dax
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=48b161983ae5266ffa42f0ccaf7224eaeda38e59;p=openwrt%2Fstaging%2Fblogic.git

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

Pull XArray fixes from Matthew Wilcox:
 "Fix some oversights in the XArray porcelain API:

   - support for m68k's two-byte aligned pointers

   - reserving entries using xa_insert()

   - missing xa_insert_bh() and xa_insert_irq() functions

   - simplify using xa_for_each()

   - use lockdep correctly

   - a few other minor fixes and improvements"

* tag 'xarray-5.0-rc3' of git://git.infradead.org/users/willy/linux-dax:
  XArray: Fix an arithmetic error in xa_is_err
  XArray tests: Check mark 2 gets squashed
  XArray: Fix typo in comment
  XArray: Honour reserved entries in xa_insert
  XArray: Permit storing 2-byte-aligned pointers
  XArray: Change xa_for_each iterator
  XArray: Turn xa_init_flags into a static inline
  XArray tests: Add RCU locking
---

48b161983ae5266ffa42f0ccaf7224eaeda38e59