Linux v4.5-8194-g1200b6809dfd

- net merge
- Comment out stmmac patches as they break the build

1 files changed, 18 insertions, 1 deletions

diff --git a/config-generic b/config-generic
index 66e155b64..4cd526b83 100644
--- a/config-generic
+++ b/config-generic
@@ -823,6 +823,7 @@ CONFIG_NET_FOU=m
 CONFIG_NET_FOU_IP_TUNNELS=y
 CONFIG_GENEVE_CORE=m
 CONFIG_GENEVE=m
+CONFIG_MACSEC=m
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
@@ -1285,6 +1286,9 @@ CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_ACT_VLAN=m
 CONFIG_NET_ACT_BPF=m
 CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
 
 CONFIG_DCB=y
 CONFIG_DNS_RESOLVER=m
@@ -1293,6 +1297,7 @@ CONFIG_BATMAN_ADV_BLA=y
 CONFIG_BATMAN_ADV_DAT=y
 CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
+CONFIG_BATMAN_ADV_BATMAN_V=y
 
 # CONFIG_BATMAN_ADV_DEBUG is not set
 CONFIG_OPENVSWITCH=m
@@ -1389,7 +1394,10 @@ CONFIG_L2TP_ETH=m
 
 # CONFIG_CAIF is not set
 
+CONFIG_AF_KCM=m
+
 CONFIG_LWTUNNEL=y
+CONFIG_NET_DEVLINK=m
 
 CONFIG_RFKILL=m
 CONFIG_RFKILL_GPIO=m
@@ -1653,6 +1661,7 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_FIXED_PHY=y
 CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BCM_UNIMAC=m
+# CONFIG_MDIO_THUNDER is not set
 CONFIG_NATIONAL_PHY=m
 CONFIG_ICPLUS_PHY=m
 CONFIG_BCM63XX_PHY=m
@@ -1686,6 +1695,7 @@ CONFIG_BNX2=m
 CONFIG_BNX2X=m
 CONFIG_BNX2X_SRIOV=y
 CONFIG_BNX2X_VXLAN=y
+CONFIG_BNX2X_GENEVE=y
 CONFIG_CNIC=m
 CONFIG_FEALNX=m
 CONFIG_ETHOC=m
@@ -1709,6 +1719,7 @@ CONFIG_MLX4_EN_VXLAN=y
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_MLX5_CORE=m
 CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_CORE_EN_DCB=y
 CONFIG_MLX5_INFINIBAND=m
 CONFIG_MLXSW_CORE=m
 CONFIG_MLXSW_CORE_HWMON=y
@@ -1803,6 +1814,7 @@ CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # 
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_AHB is not set
 # CONFIG_ATH10K_DEBUG is not set
 # CONFIG_ATH10K_TRACING is not set
 # CONFIG_ATH_TRACEPOINTS is not set
@@ -1887,6 +1899,7 @@ CONFIG_IWLDVM=m
 CONFIG_IWLMVM=m
 # CONFIG_IWLWIFI_BCAST_FILTERING is not set
 # CONFIG_IWLWIFI_UAPSD is not set
+CONFIG_IWLWIFI_PCIE_RTPM=y
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEBUGFS=y
 
@@ -2082,6 +2095,7 @@ CONFIG_CAN_8DEV_USB=m
 CONFIG_CAN_SOFTING=m
 # CONFIG_CAN_SOFTING_CS is not set
 CONFIG_CAN_SUN4I=m
+CONFIG_CAN_IFI_CANFD=m
 
 CONFIG_NETROM=m
 CONFIG_ROSE=m
@@ -2175,6 +2189,7 @@ CONFIG_BT_BREDR=y
 CONFIG_BT_HS=y
 CONFIG_BT_LE=y
 CONFIG_BT_6LOWPAN=m
+CONFIG_BT_LEDS=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BT_DEBUGFS is not set
 CONFIG_BT_SCO=y
@@ -2202,6 +2217,7 @@ CONFIG_BT_HCIUART_3WIRE=y
 CONFIG_BT_HCIUART_INTEL=y
 CONFIG_BT_HCIUART_BCM=y
 CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIUART_AG6XX=y
 CONFIG_BT_HCIDTL1=m
 CONFIG_BT_HCIBT3C=m
 CONFIG_BT_HCIBLUECARD=m
@@ -5571,7 +5587,7 @@ CONFIG_NET_DSA=m
 CONFIG_NET_DSA_HWMON=y
 CONFIG_NET_DSA_MV88E6060=m
 CONFIG_NET_DSA_MV88E6131=m
-CONFIG_NET_DSA_MV88E6123_61_65=m
+CONFIG_NET_DSA_MV88E6123=m
 CONFIG_NET_DSA_MV88E6171=m
 CONFIG_NET_DSA_MV88E6352=m
 CONFIG_NET_DSA_BCM_SF2=m
@@ -5852,6 +5868,7 @@ CONFIG_PSTORE_RAM=m
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_STATIC_KEYS is not set
 # CONFIG_TEST_PRINTF is not set
+# CONFIG_TEST_BITMAP is not set
 
 # CONFIG_AVERAGE is not set
 # CONFIG_VMXNET3 is not set