diff --git a/config-arm-generic b/config-arm-generic index 2f9f6536a..daceda01a 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -64,6 +64,7 @@ CONFIG_RTC_DRV_PL031=y CONFIG_PL330_DMA=m CONFIG_GPIO_PL061=y CONFIG_USB_ISP1760=m +CONFIG_ARM_PL172_MPMC=m # ARM VExpress CONFIG_ARCH_VEXPRESS=y @@ -107,6 +108,7 @@ CONFIG_OF_OVERLAY=y CONFIG_OF_PCI_IRQ=m CONFIG_OF_PCI=m # CONFIG_PCI_HOST_GENERIC is not set +# CONFIG_PCIE_IPROC is not set CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y CONFIG_PM_GENERIC_DOMAINS_OF=y diff --git a/config-arm64 b/config-arm64 index 929fc25ce..3510d69fc 100644 --- a/config-arm64 +++ b/config-arm64 @@ -18,6 +18,10 @@ CONFIG_ARCH_XGENE=y # CONFIG_ARCH_QCOM is not set # CONFIG_ARCH_SPRD is not set # CONFIG_ARCH_ZYNQMP is not set +# CONFIG_ARCH_BCM_IPROC is not set +# CONFIG_ARCH_BERLIN is not set +# CONFIG_ARCH_ROCKCHIP is not set + # Erratum CONFIG_ARM64_ERRATUM_826319=y diff --git a/config-armv7 b/config-armv7 index 2eb589bcc..f9369e44c 100644 --- a/config-armv7 +++ b/config-armv7 @@ -335,6 +335,7 @@ CONFIG_PHY_QCOM_UFS=m CONFIG_HWSPINLOCK_QCOM=m CONFIG_QCOM_COINCELL=m CONFIG_USB_QCOM_8X16_PHY=m +# CONFIG_QCOM_SMEM is not set # i.MX # CONFIG_MXC_DEBUG_BOARD is not set @@ -344,6 +345,7 @@ CONFIG_SOC_IMX53=y CONFIG_SOC_IMX6Q=y CONFIG_SOC_IMX6SL=y CONFIG_SOC_IMX6SX=y +CONFIG_SOC_IMX6UL=y CONFIG_SOC_IMX7D=y # CONFIG_SOC_LS1021A is not set # CONFIG_SOC_VF610 is not set @@ -367,6 +369,7 @@ CONFIG_NET_VENDOR_FREESCALE=y CONFIG_FEC=m # CONFIG_FSL_PQ_MDIO is not set # CONFIG_FSL_XGMAC_MDIO is not set +CONFIG_KEYBOARD_SNVS_PWRKEY=m CONFIG_KEYBOARD_IMX=m CONFIG_KEYBOARD_STMPE=m CONFIG_TOUCHSCREEN_STMPE=m diff --git a/config-armv7-generic b/config-armv7-generic index 7119048cd..e28a4c591 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -141,7 +141,6 @@ CONFIG_XZ_DEC_ARM=y CONFIG_PCI_HOST_GENERIC=y # CONFIG_PCI_LAYERSCAPE is not set -# CONFIG_PCIE_IPROC is not set # Do NOT enable this, it breaks stuff and makes things go slow # CONFIG_UACCESS_WITH_MEMCPY is not set @@ -391,6 +390,8 @@ CONFIG_TEGRA_SOCTHERM=m CONFIG_TEGRA_MC=y CONFIG_TEGRA124_EMC=y CONFIG_ARM_TEGRA_DEVFREQ=m +# CONFIG_ARM_TEGRA20_CPUFREQ is not set +CONFIG_ARM_TEGRA124_CPUFREQ=m # Jetson TK1 CONFIG_PINCTRL_AS3722=y diff --git a/kernel.spec b/kernel.spec index 0ee9499aa..0b6c4b995 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,7 +67,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 @@ -2053,6 +2053,9 @@ fi # # %changelog +* Wed Sep 02 2015 Josh Boyer - 4.3.0-0.rc0.git3.1 +- Linux v4.2-3986-g73b6fa8e49c2 + * Tue Sep 01 2015 Josh Boyer - 4.3.0-0.rc0.git2.1 - Linux v4.2-2890-g361f7d175734 diff --git a/sources b/sources index 552659503..c16149f23 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 3d5ea06d767e2f35c999eeadafc76523 linux-4.2.tar.xz 4c964bfba54d65b5b54cc898baddecad perf-man-4.2.tar.gz -9bd53a296c6effcd6eac8b5ed92a59e7 patch-4.2-git2.xz +68a2dc7c75dad784e4ff57b74b862376 patch-4.2-git3.xz