On Wed, Dec 14, 2016 at 09:20:43AM -0800, Linus Torvalds wrote:

[ Johannes added to participants due to radix tree changes ]

On Tue, Dec 13, 2016 at 12:00 PM, Theodore Ts'o [off-list ref] wrote:

quoted

This merge request includes the dax-4.0-iomap-pmd branch which is
needed for both ext4 and xfs dax changes to use iomap for DAX.  It
also includes the fscrypt branch which is needed for ubifs encryption
work as well as ext4 encryption and fscrypt cleanups.

Can you double-check my merge resolution with the radix tree changes
wrt the DAX changes, please? It looked straightforward, but it's an
area where I'd really like people to actually look again and test..

The radix tree bits look correct to me.