Merge tag 'for-hubcap-v4.9-more' into for-next
authorMike Marshall <hubcap@omnibond.com>
Mon, 3 Oct 2016 17:13:13 +0000 (13:13 -0400)
committerMike Marshall <hubcap@omnibond.com>
Mon, 3 Oct 2016 17:13:13 +0000 (13:13 -0400)
orangefs: miscellaneous improvements and feature negotiation

Two OrangeFS updates:

 "Pull in an OrangeFS branch containing miscellaneous improvements.

  - clean up debugfs globals
  - remove dead code in sysfs
  - reorganize duplicated sysfs attribute structs
  - consolidate sysfs show and store functions
  - remove duplicated sysfs_ops structures
  - describe organization of sysfs
  - make devreq_mutex static
  - g_orangefs_stats -> orangefs_stats for consistency
  - rename most remaining global variables"

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


Trivial merge