Merge branch 'features' into for-next
authorMartin Brandenburg <martin@omnibond.com>
Wed, 28 Sep 2016 18:47:29 +0000 (14:47 -0400)
committerMartin Brandenburg <martin@omnibond.com>
Wed, 28 Sep 2016 18:47:29 +0000 (14:47 -0400)
commitf808e138c0abd99bfce90ec8d4ef6406c2af714a
treebe66f4beb9de1b2fecbf1e59950fe714184c8ecb
parenta21aae3bb15a1d08040bdcf5a73504c0da9f5080
parent0c95ad76361f1d75a1ffdf82deafbcec44d19c42
Merge branch 'features' into for-next

Pull in an OrangeFS branch containing improvements which the userspace
component and the kernel to negotiate mutually supported features.