Merge Linus master into drm-next

The merge is clean, but the arm build fails afterwards,
due to API changes in the regulator tree.

I've included the patch into the merge to fix the build.

Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 15 insertions, 0 deletions

diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index ddad16148bd6..99382c0df17e 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -57,6 +57,21 @@ do {							\
 #define sysfs_attr_init(attr) do {} while (0)
 #endif
 
+/**
+ * struct attribute_group - data structure used to declare an attribute group.
+ * @name:       Optional: Attribute group name
+ *              If specified, the attribute group will be created in
+ *              a new subdirectory with this name.
+ * @is_visible: Optional: Function to return permissions associated with an
+ *              attribute of the group. Will be called repeatedly for each
+ *              attribute in the group. Only read/write permissions as well as
+ *              SYSFS_PREALLOC are accepted. Must return 0 if an attribute is
+ *              not visible. The returned value will replace static permissions
+ *              defined in struct attribute or struct bin_attribute.
+ * @attrs:      Pointer to NULL terminated list of attributes.
+ * @bin_attrs:  Pointer to NULL terminated list of binary attributes.
+ *              Either attrs or bin_attrs or both must be provided.
+ */
 struct attribute_group {
         const char              *name;
         umode_t                 (*is_visible)(struct kobject *,