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, 4 insertions, 0 deletions

diff --git a/include/linux/usb.h b/include/linux/usb.h
index 447fe29b55b4..b9a28074210f 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -122,6 +122,8 @@ enum usb_interface_condition {
  *      has been deferred.
  * @needs_binding: flag set when the driver should be re-probed or unbound
  *      following a reset or suspend operation it doesn't support.
+ * @authorized: This allows to (de)authorize individual interfaces instead
+ *      a whole device in contrast to the device authorization.
  * @dev: driver model's view of this device
  * @usb_dev: if an interface is bound to the USB major, this will point
  *      to the sysfs representation for that device.
@@ -178,6 +180,7 @@ struct usb_interface {
         unsigned needs_altsetting0:1;   /* switch to altsetting 0 is pending */
         unsigned needs_binding:1;       /* needs delayed unbind/rebind */
         unsigned resetting_device:1;    /* true: bandwidth alloc after reset */
+        unsigned authorized:1;          /* used for interface authorization */
 
         struct device dev;              /* interface specific device info */
         struct device *usb_dev;
@@ -325,6 +328,7 @@ struct usb_host_bos {
         /* wireless cap descriptor is handled by wusb */
         struct usb_ext_cap_descriptor   *ext_cap;
         struct usb_ss_cap_descriptor    *ss_cap;
+        struct usb_ssp_cap_descriptor   *ssp_cap;
         struct usb_ss_container_id_descriptor   *ss_id;
 };