Merge tag 'v3.7-rc2' into drm-intel-next-queued

Linux 3.7-rc2

Backmerge to solve two ugly conflicts:
- uapi. We've already added new ioctl definitions for -next. Do I need to say more?
- wc support gtt ptes. We've had to revert this for snb+ for 3.7 and
  also fix a few other things in the code. Now we know how to make it
  work on snb+, but to avoid losing the other fixes do the backmerge
  first before re-enabling wc gtt ptes on snb+.

And a few other minor things, among them git getting confused in
intel_dp.c and seemingly causing a conflict out of nothing ...

Conflicts:
	drivers/gpu/drm/i915/i915_reg.h
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/i915/intel_dp.c
	drivers/gpu/drm/i915/intel_modes.c
	include/drm/i915_drm.h

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 75 insertions, 0 deletions

diff --git a/include/uapi/linux/ipx.h b/include/uapi/linux/ipx.h
new file mode 100644
index 000000000000..3d48014cdd71
--- /dev/null
+++ b/include/uapi/linux/ipx.h
@@ -0,0 +1,75 @@
+#ifndef _IPX_H_
+#define _IPX_H_
+#include <linux/types.h>
+#include <linux/sockios.h>
+#include <linux/socket.h>
+#define IPX_NODE_LEN    6
+#define IPX_MTU         576
+
+struct sockaddr_ipx {
+        __kernel_sa_family_t sipx_family;
+        __be16          sipx_port;
+        __be32          sipx_network;
+        unsigned char   sipx_node[IPX_NODE_LEN];
+        __u8            sipx_type;
+        unsigned char   sipx_zero;      /* 16 byte fill */
+};
+
+/*
+ * So we can fit the extra info for SIOCSIFADDR into the address nicely
+ */
+#define sipx_special    sipx_port
+#define sipx_action     sipx_zero
+#define IPX_DLTITF      0
+#define IPX_CRTITF      1
+
+struct ipx_route_definition {
+        __be32        ipx_network;
+        __be32        ipx_router_network;
+        unsigned char ipx_router_node[IPX_NODE_LEN];
+};
+
+struct ipx_interface_definition {
+        __be32        ipx_network;
+        unsigned char ipx_device[16];
+        unsigned char ipx_dlink_type;
+#define IPX_FRAME_NONE          0
+#define IPX_FRAME_SNAP          1
+#define IPX_FRAME_8022          2
+#define IPX_FRAME_ETHERII       3
+#define IPX_FRAME_8023          4
+#define IPX_FRAME_TR_8022       5 /* obsolete */
+        unsigned char ipx_special;
+#define IPX_SPECIAL_NONE        0
+#define IPX_PRIMARY             1
+#define IPX_INTERNAL            2
+        unsigned char ipx_node[IPX_NODE_LEN];
+};
+        
+struct ipx_config_data {
+        unsigned char   ipxcfg_auto_select_primary;
+        unsigned char   ipxcfg_auto_create_interfaces;
+};
+
+/*
+ * OLD Route Definition for backward compatibility.
+ */
+
+struct ipx_route_def {
+        __be32          ipx_network;
+        __be32          ipx_router_network;
+#define IPX_ROUTE_NO_ROUTER     0
+        unsigned char   ipx_router_node[IPX_NODE_LEN];
+        unsigned char   ipx_device[16];
+        unsigned short  ipx_flags;
+#define IPX_RT_SNAP             8
+#define IPX_RT_8022             4
+#define IPX_RT_BLUEBOOK         2
+#define IPX_RT_ROUTED           1
+};
+
+#define SIOCAIPXITFCRT          (SIOCPROTOPRIVATE)
+#define SIOCAIPXPRISLT          (SIOCPROTOPRIVATE + 1)
+#define SIOCIPXCFGDATA          (SIOCPROTOPRIVATE + 2)
+#define SIOCIPXNCPCONN          (SIOCPROTOPRIVATE + 3)
+#endif /* _IPX_H_ */