• Linus Torvalds's avatar
    Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · c0e8a139
    Linus Torvalds authored
    Pull cgroup updates from Tejun Heo:
    
     - xattr support added.  The implementation is shared with tmpfs.  The
       usage is restricted and intended to be used to manage per-cgroup
       metadata by system software.  tmpfs changes are routed through this
       branch with Hugh's permission.
    
     - cgroup subsystem ID handling simplified.
    
    * 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
      cgroup: Define CGROUP_SUBSYS_COUNT according the configuration
      cgroup: Assign subsystem IDs during compile time
      cgroup: Do not depend on a given order when populating the subsys array
      cgroup: Wrap subsystem selection macro
      cgroup: Remove CGROUP_BUILTIN_SUBSYS_COUNT
      cgroup: net_prio: Do not define task_netpioidx() when not selected
      cgroup: net_cls: Do not define task_cls_classid() when not selected
      cgroup: net_cls: Move sock_update_classid() declaration to cls_cgroup.h
      cgroup: trivial fixes for Documentation/cgroups/cgroups.txt
      xattr: mark variable as uninitialized to make both gcc and smatch happy
      fs: add missing documentation to simple_xattr functions
      cgroup: add documentation on extended attributes usage
      cgroup: rename subsys_bits to subsys_mask
      cgroup: add xattr support
      cgroup: revise how we re-populate root directory
      xattr: extract simple_xattr code from tmpfs
    c0e8a139
sock.c 68.6 KB