diff --git a/0001-drivers-net-phy-Correct-duplicate-MDIO_XGENE-entry.patch b/0001-drivers-net-phy-Correct-duplicate-MDIO_XGENE-entry.patch new file mode 100644 index 0000000..e5bc0fd --- /dev/null +++ b/0001-drivers-net-phy-Correct-duplicate-MDIO_XGENE-entry.patch @@ -0,0 +1,43 @@ +From b0a46f7c26a6c754ff4fc716741c5aeacf125ec9 Mon Sep 17 00:00:00 2001 +From: Laura Abbott +Date: Thu, 6 Oct 2016 11:15:11 -0700 +Subject: [PATCH] drivers: net: phy: Correct duplicate MDIO_XGENE entry + +An extra entry for MDIO_XGENE got added during merging. +Delete the extra. + +Reviewed-by: Andrew Lunn +Signed-off-by: Laura Abbott +--- + drivers/net/phy/Kconfig | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig +index 5078a0d..2651c8d 100644 +--- a/drivers/net/phy/Kconfig ++++ b/drivers/net/phy/Kconfig +@@ -142,6 +142,7 @@ config MDIO_THUNDER + + config MDIO_XGENE + tristate "APM X-Gene SoC MDIO bus controller" ++ depends on ARCH_XGENE || COMPILE_TEST + help + This module provides a driver for the MDIO busses found in the + APM X-Gene SoC's. +@@ -320,13 +321,6 @@ config XILINX_GMII2RGMII + the Reduced Gigabit Media Independent Interface(RGMII) between + Ethernet physical media devices and the Gigabit Ethernet controller. + +-config MDIO_XGENE +- tristate "APM X-Gene SoC MDIO bus controller" +- depends on ARCH_XGENE || COMPILE_TEST +- help +- This module provides a driver for the MDIO busses found in the +- APM X-Gene SoC's. +- + endif # PHYLIB + + config MICREL_KS8995MA +-- +2.7.4 + diff --git a/config-arm64 b/config-arm64 index 88197fc..87794ec 100644 --- a/config-arm64 +++ b/config-arm64 @@ -282,6 +282,7 @@ CONFIG_NET_VENDOR_CAVIUM=y CONFIG_THUNDER_NIC_PF=m CONFIG_THUNDER_NIC_VF=m CONFIG_THUNDER_NIC_BGX=m +CONFIG_THUNDER_NIC_RGX=m # CONFIG_LIQUIDIO is not set # CONFIG_SPI_THUNDERX is not set diff --git a/config-armv7-generic b/config-armv7-generic index 5f8e812..e2bf92a 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -24,6 +24,7 @@ CONFIG_ARM_CPU_TOPOLOGY=y CONFIG_ARM_DMA_MEM_BUFFERABLE=y CONFIG_SWP_EMULATE=y CONFIG_CACHE_L2X0=y +CONFIG_CACHE_L2X0_PMU=y CONFIG_HIGHPTE=y CONFIG_AUTO_ZRELADDR=y CONFIG_ATAGS=y @@ -468,6 +469,7 @@ CONFIG_GPIO_MC33880=m CONFIG_GPIO_TPS65910=y CONFIG_GPIO_TPS65912=m # CONFIG_GPIO_ZEVIO is not set +# CONFIG_GPIO_AXP209 is not set CONFIG_LEDS_GPIO=m CONFIG_LEDS_GPIO_REGISTER=y CONFIG_MDIO_BUS_MUX=m @@ -526,6 +528,8 @@ CONFIG_EEPROM_93XX46=m CONFIG_SND_ARM=y CONFIG_SND_SOC_AC97_BUS=y CONFIG_SND_SOC_AC97_CODEC=y +# CONFIG_SND_SOC_RK3399_GRU_SOUND is not set +# CONFIG_SND_SOC_TEGRA_SGTL5000 is not set # RTC CONFIG_RTC_DRV_DS1305=m @@ -690,6 +694,7 @@ CONFIG_DWMAC_GENERIC=m # CONFIG_DWMAC_MESON is not set # CONFIG_DWMAC_SOCFPGA is not set # CONFIG_DWMAC_STI is not set +# CONFIG_DWMAC_STM32 is not set CONFIG_R8188EU=m diff --git a/config-generic b/config-generic index c61a050..9a2477b 100644 --- a/config-generic +++ b/config-generic @@ -200,6 +200,7 @@ CONFIG_INFINIBAND_USNIC=m CONFIG_INFINIBAND_RDMAVT=m CONFIG_RDMA_RXE=m +# CONFIG_INFINIBAND_QEDR is not set # # Executable file formats @@ -209,6 +210,7 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y # CONFIG_BINFMT_AOUT is not set CONFIG_BINFMT_SCRIPT=y CONFIG_BINFMT_MISC=m +# CONFIG_BINFMT_FLAT is not set # # Device Drivers @@ -803,6 +805,7 @@ CONFIG_TCP_CONG_NV=m CONFIG_TCP_CONG_VENO=m CONFIG_TCP_CONG_WESTWOOD=m CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_BBR=m CONFIG_TCP_MD5SIG=y @@ -1119,6 +1122,7 @@ CONFIG_NFT_COMPAT=m CONFIG_NF_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_FWD_NETDEV=m +CONFIG_NFT_NUMGEN=m CONFIG_NF_TABLES_IPV4=m CONFIG_NF_DUP_IPV4=m @@ -1134,6 +1138,10 @@ CONFIG_NF_TABLES_ARP=m CONFIG_NF_TABLES_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NFT_SET_RBTREE=m +CONFIG_NFT_SET_HASH=m +CONFIG_NFT_QUOTA=m + CONFIG_NF_TABLES_BRIDGE=m # @@ -1305,8 +1313,11 @@ CONFIG_NET_ACT_VLAN=m CONFIG_NET_ACT_BPF=m CONFIG_NET_ACT_CONNMARK=m CONFIG_NET_ACT_IFE=m +CONFIG_NET_ACT_SKBMOD=m +CONFIG_NET_ACT_TUNNEL_KEY=m CONFIG_NET_IFE_SKBMARK=m CONFIG_NET_IFE_SKBPRIO=m +CONFIG_NET_IFE_SKBTCINDEX=m CONFIG_DCB=y CONFIG_DNS_RESOLVER=m @@ -1318,6 +1329,7 @@ CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_BATMAN_V=y # CONFIG_BATMAN_ADV_DEBUG is not set +# CONFIG_BATMAN_ADV_DEBUGFS is not set CONFIG_OPENVSWITCH=m CONFIG_OPENVSWITCH_GRE=y CONFIG_OPENVSWITCH_VXLAN=y @@ -1438,6 +1450,8 @@ CONFIG_ACENIC=m CONFIG_ALTERA_TSE=m +# CONFIG_NET_VENDOR_AMAZON is not set + CONFIG_NET_VENDOR_AMD=y CONFIG_PCNET32=m CONFIG_AMD8111_ETH=m @@ -1669,6 +1683,7 @@ CONFIG_CICADA_PHY=m CONFIG_DAVICOM_PHY=m CONFIG_DP83640_PHY=m CONFIG_MICROCHIP_PHY=m +CONFIG_MICROSEMI_PHY=m CONFIG_FIXED_PHY=y CONFIG_MDIO_BITBANG=m CONFIG_MDIO_BCM_UNIMAC=m @@ -1687,6 +1702,7 @@ CONFIG_REALTEK_PHY=m CONFIG_SMSC_PHY=m CONFIG_STE10XP=m CONFIG_VITESSE_PHY=m +CONFIG_XILINX_GMII2RGMII=m CONFIG_MICREL_PHY=m CONFIG_DP83867_PHY=m CONFIG_DP83848_PHY=m @@ -2219,6 +2235,7 @@ CONFIG_BT_HCIUART_INTEL=y CONFIG_BT_HCIUART_BCM=y CONFIG_BT_HCIUART_QCA=y CONFIG_BT_HCIUART_AG6XX=y +CONFIG_BT_HCIUART_MRVL=y CONFIG_BT_HCIDTL1=m CONFIG_BT_HCIBT3C=m CONFIG_BT_HCIBLUECARD=m @@ -2234,6 +2251,7 @@ CONFIG_BT_MRVL_SDIO=m CONFIG_BT_ATH3K=m CONFIG_BT_QCA=m CONFIG_BT_WILINK=m +# CONFIG_BT_QCOMSMD is not set # # ISDN subsystem @@ -3117,6 +3135,17 @@ CONFIG_PA12203001=m # CONFIG_MCP4131 is not set # CONFIG_HP03 is not set # CONFIG_HP206C is not set +# CONFIG_DMARD06 is not set +# CONFIG_DMARD09 is not set +# CONFIG_MC3230 is not set +# CONFIG_TI_ADC12138 is not set +# CONFIG_TI_ADC161S626 is not set +# CONFIG_AD8801 is not set +# CONFIG_SI1145 is not set +# CONFIG_AK8974 is not set +# CONFIG_ZPA2326 is not set +# CONFIG_MAXIM_THERMOCOUPLE is not set +# CONFIG_LTC2485 is not set # staging IIO drivers # CONFIG_AD7291 is not set @@ -4530,6 +4559,7 @@ CONFIG_MFD_VIPERBOARD=m # CONFIG_MFD_TC3589X is not set # CONFIG_MFD_TC6393XB is not set # CONFIG_MFD_TI_AM335X_TSCADC is not set +# CONFIG_MFD_TI_LP873X is not set # CONFIG_MFD_TIMBERDALE is not set # CONFIG_MFD_TPS65086 is not set # CONFIG_MFD_TPS65090 is not set @@ -5084,6 +5114,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m # CONFIG_CRYPTO_DRBG_MENU is not set CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +# CONFIG_CRYPTO_DEV_CHELSIO is not set CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_RSA=m @@ -5405,6 +5436,9 @@ CONFIG_SND_SOC_AMD_ACP=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_WM8985 is not set +# CONFIG_SND_SOC_NAU8810 is not set +# CONFIG_SND_SIMPLE_SCU_CARD is not set + CONFIG_BALLOON_COMPACTION=y @@ -5667,6 +5701,9 @@ CONFIG_NET_DSA_HWMON=y CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6XXX=m CONFIG_NET_DSA_BCM_SF2=m +CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y +CONFIG_NET_DSA_QCA8K=m + CONFIG_B53=m CONFIG_B53_SPI_DRIVER=m @@ -5704,6 +5741,7 @@ CONFIG_UWB_I1480U=m CONFIG_STAGING=y # CONFIG_ANDROID is not set +# CONFIG_GREYBUS is not set # CONFIG_STAGING_BOARD is not set CONFIG_STAGING_MEDIA=y # CONFIG_MEDIA_CEC is not set @@ -5859,6 +5897,7 @@ CONFIG_I2C_DESIGNWARE_PCI=m # CONFIG_W1_MASTER_GPIO is not set # CONFIG_LEDS_GPIO is not set CONFIG_GPIO_SYSFS=y +# CONFIG_GPIO_MOCKUP is not set # CONFIG_GPIO_GENERIC_PLATFORM is not set # CONFIG_GPIO_MAX732X is not set # CONFIG_GPIO_PCA953X is not set @@ -5905,6 +5944,7 @@ CONFIG_GPIO_VIPERBOARD=m # CONFIG_GPIO_TPS65218 is not set # CONFIG_GPIO_104_DIO_48E is not set # CONFIG_GPIO_WS16C48 is not set +# CONFIG_GPIO_TS4900 is not set # FIXME: Why? diff --git a/config-x86-generic b/config-x86-generic index c6ca6d5..6d476f2 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -120,7 +120,7 @@ CONFIG_GPIO_CRYSTAL_COVE=y CONFIG_AXP288_ADC=y CONFIG_AXP288_FUEL_GAUGE=y CONFIG_PWM_CRC=y - +CONFIG_GPIO_WHISKEY_COVE=y CONFIG_X86_INTEL_PSTATE=y CONFIG_X86_ACPI_CPUFREQ=m @@ -562,6 +562,7 @@ CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m +CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m CONFIG_SND_SOC_AC97_CODEC=m # CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SUN4I_CODEC is not set diff --git a/gitrev b/gitrev index f4ff208..988313a 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -a3443cda5588985a2724d6d0f4a5f04e625be6eb +d230ec72c4efed7d0f414a80a756c54d4c422a6e diff --git a/kernel.spec b/kernel.spec index 3a63b06..d139f67 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -618,6 +618,9 @@ Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch #CVE-2016-7425 rhbz 1377330 1377331 Patch850: arcmsr-buffer-overflow-in-archmsr_iop_message_xfer.patch +# Fix came in locally +Patch851: 0001-drivers-net-phy-Correct-duplicate-MDIO_XGENE-entry.patch + # END OF PATCH DEFINITIONS %endif @@ -2154,6 +2157,9 @@ fi # # %changelog +* Thu Oct 06 2016 Laura Abbott - 4.9.0-0.rc0.git3.1 +- Linux v4.8-8780-gd230ec7 + * Wed Oct 05 2016 Laura Abbott - 4.9.0-0.rc0.git2.1 - Linux v4.8-2283-ga3443cd diff --git a/sources b/sources index 556a70a..5c2c812 100644 --- a/sources +++ b/sources @@ -2,3 +2,4 @@ c1af0afbd3df35c1ccdc7a5118cd2d07 linux-4.8.tar.xz 0dad03f586e835d538d3e0d2cbdb9a28 perf-man-4.8.tar.gz 16c84040a62d0127bc02b8cad49910fd patch-4.8-git1.xz 7d9925bfab67c065fbfa4df91cf9a4b4 patch-4.8-git2.xz +4323a2066235257370c9d5ffa34cea56 patch-4.8-git3.xz