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/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index 4f0d1bc3647d..439873775d49 100644
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -87,6 +87,7 @@ enum {
 #define TC_ACT_STOLEN           4
 #define TC_ACT_QUEUED           5
 #define TC_ACT_REPEAT           6
+#define TC_ACT_REDIRECT         7
 #define TC_ACT_JUMP             0x10000000
 
 /* Action type identifiers*/
@@ -373,6 +374,8 @@ enum {
 
 /* BPF classifier */
 
+#define TCA_BPF_FLAG_ACT_DIRECT         (1 << 0)
+
 enum {
         TCA_BPF_UNSPEC,
         TCA_BPF_ACT,
@@ -382,6 +385,7 @@ enum {
         TCA_BPF_OPS,
         TCA_BPF_FD,
         TCA_BPF_NAME,
+        TCA_BPF_FLAGS,
         __TCA_BPF_MAX,
 };