Merge tag 'v4.4-rc2' into drm-intel-next-queued

Linux 4.4-rc2

Backmerge to get at

commit 1b0e3a049efe471c399674fd954500ce97438d30
Author: Imre Deak <imre.deak@intel.com>
Date:   Thu Nov 5 23:04:11 2015 +0200

    drm/i915/skl: disable display side power well support for now

so that we can proplery re-eanble skl power wells in -next.

Conflicts are just adjacent lines changed, except for intel_fbdev.c
where we need to interleave the changs. Nothing nefarious.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 11 insertions, 7 deletions

diff --git a/include/linux/xattr.h b/include/linux/xattr.h
index 91b0a68d38dc..89474b9d260c 100644
--- a/include/linux/xattr.h
+++ b/include/linux/xattr.h
@@ -21,15 +21,19 @@ struct dentry;
 
 struct xattr_handler {
         const char *prefix;
-        int flags;      /* fs private flags passed back to the handlers */
-        size_t (*list)(struct dentry *dentry, char *list, size_t list_size,
-                       const char *name, size_t name_len, int handler_flags);
-        int (*get)(struct dentry *dentry, const char *name, void *buffer,
-                   size_t size, int handler_flags);
-        int (*set)(struct dentry *dentry, const char *name, const void *buffer,
-                   size_t size, int flags, int handler_flags);
+        int flags;      /* fs private flags */
+        size_t (*list)(const struct xattr_handler *, struct dentry *dentry,
+                       char *list, size_t list_size, const char *name,
+                       size_t name_len);
+        int (*get)(const struct xattr_handler *, struct dentry *dentry,
+                   const char *name, void *buffer, size_t size);
+        int (*set)(const struct xattr_handler *, struct dentry *dentry,
+                   const char *name, const void *buffer, size_t size,
+                   int flags);
 };
 
+const char *xattr_full_name(const struct xattr_handler *, const char *);
+
 struct xattr {
         const char *name;
         void *value;