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

diff --git a/include/linux/usb/cdc.h b/include/linux/usb/cdc.h
new file mode 100644
index 000000000000..b5706f94ee9e
--- /dev/null
+++ b/include/linux/usb/cdc.h
@@ -0,0 +1,51 @@
+/*
+ * USB CDC common helpers
+ *
+ * Copyright (c) 2015 Oliver Neukum <oneukum@suse.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ */
+#ifndef __LINUX_USB_CDC_H
+#define __LINUX_USB_CDC_H
+
+#include <uapi/linux/usb/cdc.h>
+
+/*
+ * inofficial magic numbers
+ */
+
+#define CDC_PHONET_MAGIC_NUMBER         0xAB
+
+/*
+ * parsing CDC headers
+ */
+
+struct usb_cdc_parsed_header {
+        struct usb_cdc_union_desc *usb_cdc_union_desc;
+        struct usb_cdc_header_desc *usb_cdc_header_desc;
+
+        struct usb_cdc_call_mgmt_descriptor *usb_cdc_call_mgmt_descriptor;
+        struct usb_cdc_acm_descriptor *usb_cdc_acm_descriptor;
+        struct usb_cdc_country_functional_desc *usb_cdc_country_functional_desc;
+        struct usb_cdc_network_terminal_desc *usb_cdc_network_terminal_desc;
+        struct usb_cdc_ether_desc *usb_cdc_ether_desc;
+        struct usb_cdc_dmm_desc *usb_cdc_dmm_desc;
+        struct usb_cdc_mdlm_desc *usb_cdc_mdlm_desc;
+        struct usb_cdc_mdlm_detail_desc *usb_cdc_mdlm_detail_desc;
+        struct usb_cdc_obex_desc *usb_cdc_obex_desc;
+        struct usb_cdc_ncm_desc *usb_cdc_ncm_desc;
+        struct usb_cdc_mbim_desc *usb_cdc_mbim_desc;
+        struct usb_cdc_mbim_extended_desc *usb_cdc_mbim_extended_desc;
+
+        bool phonet_magic_present;
+};
+
+struct usb_interface;
+int cdc_parse_cdc_header(struct usb_cdc_parsed_header *hdr,
+                                struct usb_interface *intf,
+                                u8 *buffer,
+                                int buflen);
+
+#endif /* __LINUX_USB_CDC_H */