Linux v4.2-6105-gdd5cdb48edfd

- Networking merge

1 files changed, 22 insertions, 0 deletions

diff --git a/config-generic b/config-generic
index d6b235dce..35b54d818 100644
--- a/config-generic
+++ b/config-generic
@@ -822,6 +822,7 @@ CONFIG_IP_VS_PROTO_ESP=y
 CONFIG_IP_VS_PROTO_AH=y
 CONFIG_IP_VS_PROTO_SCTP=y
 CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
 CONFIG_IP_VS_IPV6=y
 CONFIG_IP_VS_RR=m
 CONFIG_IP_VS_WRR=m
@@ -850,6 +851,7 @@ CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_IPV6_MIP6=y
+CONFIG_IPV6_ILA=m
 CONFIG_IPV6_VTI=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=y
@@ -1077,8 +1079,12 @@ CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NF_TABLES_IPV4=m
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 CONFIG_NF_TABLES_ARP=m
@@ -1266,6 +1272,7 @@ CONFIG_BATMAN_ADV_MCAST=y
 
 # CONFIG_BATMAN_ADV_DEBUG is not set
 CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_CONNTRACK=y
 CONFIG_OPENVSWITCH_GRE=y
 CONFIG_OPENVSWITCH_VXLAN=y
 CONFIG_OPENVSWITCH_GENEVE=y
@@ -1304,6 +1311,7 @@ CONFIG_TUN=m
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_VETH=m
 CONFIG_NLMON=m
+CONFIG_NET_VRF=m
 
 #
 # ATM
@@ -1357,6 +1365,8 @@ CONFIG_L2TP_ETH=m
 
 # CONFIG_CAIF is not set
 
+CONFIG_LWTUNNEL=y
+
 CONFIG_RFKILL=m
 CONFIG_RFKILL_GPIO=m
 CONFIG_RFKILL_INPUT=y
@@ -1578,6 +1588,9 @@ CONFIG_SUNGEM=m
 CONFIG_CASSINI=m
 CONFIG_NIU=m
 
+# CONFIG_NET_VENDOR_SYNOPSYS is not set
+# CONFIG_SYNOPSYS_DWC_ETH_QOS is not set
+
 CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 
@@ -1622,6 +1635,8 @@ CONFIG_VITESSE_PHY=m
 CONFIG_MICREL_PHY=m
 CONFIG_DP83867_PHY=m
 # CONFIG_MICREL_KS8995MA is not set
+CONFIG_AQUANTIA_PHY=m
+CONFIG_TERANETICS_PHY=m
 
 CONFIG_MII=m
 CONFIG_NET_CORE=y
@@ -1636,6 +1651,7 @@ CONFIG_BCMGENET=m
 CONFIG_BNX2=m
 CONFIG_BNX2X=m
 CONFIG_BNX2X_SRIOV=y
+CONFIG_BNX2X_VXLAN=y
 CONFIG_CNIC=m
 CONFIG_FEALNX=m
 CONFIG_ETHOC=m
@@ -1653,6 +1669,7 @@ CONFIG_JME=m
 # CONFIG_MLX4_EN is not set
 # CONFIG_MLX4_EN_VXLAN is not set
 # CONFIG_MLX5_CORE is not set
+# CONFIG_MLXSW_CORE is not set
 # CONFIG_SFC is not set
 
 # CONFIG_FDDI is not set
@@ -1905,6 +1922,7 @@ CONFIG_IEEE802154_CC2520=m
 CONFIG_MAC802154=m
 CONFIG_NET_MPLS_GSO=m
 CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
 
 CONFIG_NET_SWITCHDEV=y
 
@@ -2021,6 +2039,7 @@ CONFIG_NFC_ST21NFCA_I2C=m
 # CONFIG_NFC_NCI_SPI is not set
 # CONFIG_NFC_NCI_UART is not set
 # CONFIG_NFC_ST_NCI is not set
+# CONFIG_NFC_S3FWRN5_I2C is not set
 
 
 #
@@ -2066,6 +2085,7 @@ CONFIG_WINBOND_FIR=m
 #
 CONFIG_BT=m
 CONFIG_BT_BREDR=y
+CONFIG_BT_HS=y
 CONFIG_BT_LE=y
 CONFIG_BT_6LOWPAN=m
 # CONFIG_BT_SELFTEST is not set
@@ -2094,6 +2114,7 @@ CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_3WIRE=y
 CONFIG_BT_HCIUART_INTEL=y
 CONFIG_BT_HCIUART_BCM=y
+CONFIG_BT_HCIUART_QCA=y
 CONFIG_BT_HCIDTL1=m
 CONFIG_BT_HCIBT3C=m
 CONFIG_BT_HCIBLUECARD=m
@@ -3988,6 +4009,7 @@ CONFIG_USB_KAWETH=m
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_NET_AX8817X=m