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, 26 insertions, 29 deletions

diff --git a/include/uapi/linux/if_arcnet.h b/include/uapi/linux/if_arcnet.h
index 46e34bd0e783..cfb642f8e7bd 100644
--- a/include/uapi/linux/if_arcnet.h
+++ b/include/uapi/linux/if_arcnet.h
@@ -19,7 +19,6 @@
 #include <linux/types.h>
 #include <linux/if_ether.h>
 
-
 /*
  *    These are the defined ARCnet Protocol ID's.
  */
@@ -57,42 +56,40 @@
  * The RFC1201-specific components of an arcnet packet header.
  */
 struct arc_rfc1201 {
-    __u8  proto;                /* protocol ID field - varies           */
-    __u8  split_flag;   /* for use with split packets           */
-    __be16   sequence;          /* sequence number                      */
-    __u8  payload[0];   /* space remaining in packet (504 bytes)*/
+        __u8  proto;            /* protocol ID field - varies           */
+        __u8  split_flag;       /* for use with split packets           */
+        __be16   sequence;      /* sequence number                      */
+        __u8  payload[0];       /* space remaining in packet (504 bytes)*/
 };
 #define RFC1201_HDR_SIZE 4
 
-
 /*
  * The RFC1051-specific components.
  */
 struct arc_rfc1051 {
-    __u8 proto;         /* ARC_P_RFC1051_ARP/RFC1051_IP */
-    __u8 payload[0];            /* 507 bytes                    */
+        __u8 proto;             /* ARC_P_RFC1051_ARP/RFC1051_IP */
+        __u8 payload[0];        /* 507 bytes                    */
 };
 #define RFC1051_HDR_SIZE 1
 
-
 /*
  * The ethernet-encap-specific components.  We have a real ethernet header
  * and some data.
  */
 struct arc_eth_encap {
-    __u8 proto;         /* Always ARC_P_ETHER                   */
-    struct ethhdr eth;          /* standard ethernet header (yuck!)     */
-    __u8 payload[0];            /* 493 bytes                            */
+        __u8 proto;             /* Always ARC_P_ETHER                   */
+        struct ethhdr eth;      /* standard ethernet header (yuck!)     */
+        __u8 payload[0];        /* 493 bytes                            */
 };
 #define ETH_ENCAP_HDR_SIZE 14
 
-
 struct arc_cap {
         __u8 proto;
-        __u8 cookie[sizeof(int)];   /* Actually NOT sent over the network */
+        __u8 cookie[sizeof(int)];
+                                /* Actually NOT sent over the network */
         union {
                 __u8 ack;
-                __u8 raw[0];            /* 507 bytes */
+                __u8 raw[0];    /* 507 bytes */
         } mes;
 };
 
@@ -105,9 +102,9 @@ struct arc_cap {
  * driver.
  */
 struct arc_hardware {
-    __u8  source,               /* source ARCnet - filled in automagically */
-             dest,              /* destination ARCnet - 0 for broadcast    */
-             offset[2];         /* offset bytes (some weird semantics)     */
+        __u8 source;            /* source ARCnet - filled in automagically */
+        __u8 dest;              /* destination ARCnet - 0 for broadcast    */
+        __u8 offset[2];         /* offset bytes (some weird semantics)     */
 };
 #define ARC_HDR_SIZE 4
 
@@ -116,17 +113,17 @@ struct arc_hardware {
  * when you do a raw packet capture).
  */
 struct archdr {
-    /* hardware requirements */
-    struct arc_hardware hard;
-     
-    /* arcnet encapsulation-specific bits */
-    union {
-        struct arc_rfc1201   rfc1201;
-        struct arc_rfc1051   rfc1051;
-        struct arc_eth_encap eth_encap;
-        struct arc_cap       cap;
-        __u8 raw[0];            /* 508 bytes                            */
-    } soft;
+        /* hardware requirements */
+        struct arc_hardware hard;
+
+        /* arcnet encapsulation-specific bits */
+        union {
+                struct arc_rfc1201   rfc1201;
+                struct arc_rfc1051   rfc1051;
+                struct arc_eth_encap eth_encap;
+                struct arc_cap       cap;
+                __u8 raw[0];    /* 508 bytes                            */
+        } soft;
 };
 
 #endif                          /* _LINUX_IF_ARCNET_H */