Merge branch 'linus' into perf/core, to fix conflicts

Conflicts:
	arch/x86/kernel/cpu/perf_event_intel_uncore*.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 8 insertions, 0 deletions

diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h
index d99800cbdcf3..dcfdecbfa0b7 100644
--- a/include/linux/netdev_features.h
+++ b/include/linux/netdev_features.h
@@ -176,4 +176,12 @@ enum {
                                  NETIF_F_HW_VLAN_STAG_RX | \
                                  NETIF_F_HW_VLAN_STAG_TX)
 
+#define NETIF_F_GSO_ENCAP_ALL   (NETIF_F_GSO_GRE |                      \
+                                 NETIF_F_GSO_GRE_CSUM |                 \
+                                 NETIF_F_GSO_IPIP |                     \
+                                 NETIF_F_GSO_SIT |                      \
+                                 NETIF_F_GSO_UDP_TUNNEL |               \
+                                 NETIF_F_GSO_UDP_TUNNEL_CSUM |          \
+                                 NETIF_F_GSO_MPLS)
+
 #endif  /* _LINUX_NETDEV_FEATURES_H */