Linux v4.2-6105-gdd5cdb48edfd

- Networking merge
This commit is contained in:
Josh Boyer 2015-09-03 16:00:15 -04:00
parent 55d5380c91
commit f7d396f406
8 changed files with 37 additions and 2 deletions

View File

@ -160,6 +160,8 @@ CONFIG_BTT=y
CONFIG_ND_BTT=m CONFIG_ND_BTT=m
CONFIG_ND_BLK=m CONFIG_ND_BLK=m
CONFIG_MDIO_OCTEON=m
# CONFIG_SND_SOC is not set # CONFIG_SND_SOC is not set
# CONFIG_PMIC_OPREGION is not set # CONFIG_PMIC_OPREGION is not set
@ -168,3 +170,4 @@ CONFIG_ND_BLK=m
CONFIG_DEBUG_SECTION_MISMATCH=y CONFIG_DEBUG_SECTION_MISMATCH=y
# CONFIG_FSL_MC_BUS is not set # CONFIG_FSL_MC_BUS is not set
# CONFIG_FUJITSU_ES is not set

View File

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

View File

@ -359,6 +359,8 @@ CONFIG_I2C_MPC=m
# CONFIG_NET_VENDOR_PASEMI is not set # CONFIG_NET_VENDOR_PASEMI is not set
# CONFIG_NET_VENDOR_TOSHIBA is not set # CONFIG_NET_VENDOR_TOSHIBA is not set
CONFIG_MDIO_OCTEON=m
# CONFIG_OF_UNITTEST is not set # CONFIG_OF_UNITTEST is not set
# CONFIG_OF_OVERLAY is not set # CONFIG_OF_OVERLAY is not set
# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set

View File

@ -291,6 +291,7 @@ CONFIG_HOTPLUG_PCI_S390=y
# CONFIG_SH_ETH is not set # CONFIG_SH_ETH is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_IEEE802154_DRIVERS is not set # CONFIG_IEEE802154_DRIVERS is not set
# CONFIG_MDIO_OCTEON is not set
# CONFIG_FMC is not set # CONFIG_FMC is not set

View File

@ -570,6 +570,7 @@ CONFIG_EFI_SIGNATURE_LIST_PARSER=y
CONFIG_MODULE_SIG_UEFI=y CONFIG_MODULE_SIG_UEFI=y
CONFIG_VMXNET3=m CONFIG_VMXNET3=m
CONFIG_FUJITSU_ES=m
CONFIG_VFIO_PCI_VGA=y CONFIG_VFIO_PCI_VGA=y
CONFIG_PCH_CAN=m CONFIG_PCH_CAN=m

View File

@ -201,6 +201,8 @@ CONFIG_BTT=y
CONFIG_ND_BTT=m CONFIG_ND_BTT=m
CONFIG_ND_BLK=m CONFIG_ND_BLK=m
CONFIG_MDIO_OCTEON=m
CONFIG_NO_HZ_FULL=y CONFIG_NO_HZ_FULL=y
# CONFIG_NO_HZ_IDLE is not set # CONFIG_NO_HZ_IDLE is not set
# CONFIG_NO_HZ_FULL_ALL is not set # CONFIG_NO_HZ_FULL_ALL is not set

View File

@ -67,7 +67,7 @@ Summary: The Linux kernel
# The rc snapshot level # The rc snapshot level
%define rcrev 0 %define rcrev 0
# The git snapshot level # The git snapshot level
%define gitrev 5 %define gitrev 6
# Set rpm version accordingly # Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0 %define rpmversion 4.%{upstream_sublevel}.0
%endif %endif
@ -2051,6 +2051,10 @@ fi
# #
# #
%changelog %changelog
* Thu Sep 03 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.3.0-0.rc0.git6.1
- Linux v4.2-6105-gdd5cdb48edfd
- Networking merge
* Thu Sep 03 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.3.0-0.rc0.git5.1 * Thu Sep 03 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.3.0-0.rc0.git5.1
- Linux v4.2-4507-g1e1a4e8f4391 - Linux v4.2-4507-g1e1a4e8f4391

View File

@ -1,3 +1,3 @@
3d5ea06d767e2f35c999eeadafc76523 linux-4.2.tar.xz 3d5ea06d767e2f35c999eeadafc76523 linux-4.2.tar.xz
4c964bfba54d65b5b54cc898baddecad perf-man-4.2.tar.gz 4c964bfba54d65b5b54cc898baddecad perf-man-4.2.tar.gz
f57bb98aaa33a7a2bb3d9cfe5e636e4b patch-4.2-git5.xz 7a8cfdfeefe8abdc749b88109a293ebd patch-4.2-git6.xz