From 7603bfc69d74c9d9cce141583fb141f47773c65f Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Jan 24 2014 12:49:16 +0000 Subject: Linux v3.13-5617-g3aacd62 --- diff --git a/config-arm-generic b/config-arm-generic index 3c2f27c..c2c8755 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -20,6 +20,7 @@ CONFIG_RESET_GPIO=y CONFIG_RCU_FANOUT_LEAF=16 # CONFIG_RTC_DRV_SNVS is not set +# CONFIG_RTC_DRV_HYM8563 is not set CONFIG_BACKLIGHT_PWM=m CONFIG_INPUT_PWM_BEEPER=m CONFIG_ARM_SP805_WATCHDOG=m @@ -150,6 +151,11 @@ CONFIG_THERMAL_GOV_USER_SPACE=y # CONFIG_DRM_TEGRA is not set # CONFIG_SHMOBILE_IOMMU is not set +# CONFIG_COMMON_CLK_SI570 is not set +# CONFIG_COMMON_CLK_QCOM is not set + +# CONFIG_ARM_PTDUMP is not set + ### turn off things which make no sense on embedded SoC # core diff --git a/config-armv7 b/config-armv7 index 1349112..0dab8af 100644 --- a/config-armv7 +++ b/config-armv7 @@ -317,6 +317,7 @@ CONFIG_TI_ADC081C=m CONFIG_TI_AM335X_ADC=m CONFIG_PWM_TIPWMSS=y CONFIG_SND_AM33XX_SOC_EVM=m +# CONFIG_GPIO_DAVINCI is not set # Allwinner a1x CONFIG_PINCTRL_SUNXI=y @@ -325,10 +326,12 @@ CONFIG_MDIO_SUN4I=m CONFIG_NET_VENDOR_ALLWINNER=y CONFIG_SUN4I_EMAC=m CONFIG_EEPROM_SUNXI_SID=m +# CONFIG_RTC_DRV_SUNXI is not set # i.MX CONFIG_MXC_IRQ_PRIOR=y # CONFIG_MXC_DEBUG_BOARD is not set +# CONFIG_SOC_IMX50 is not set CONFIG_SOC_IMX53=y CONFIG_SOC_IMX6Q=y CONFIG_SOC_IMX6SL=y @@ -501,6 +504,7 @@ CONFIG_ARCH_TEGRA_3x_SOC=y CONFIG_ARM_TEGRA_CPUFREQ=y CONFIG_TEGRA20_MC=y CONFIG_TEGRA30_MC=y +# CONFIG_TRUSTED_FOUNDATIONS is not set CONFIG_SERIAL_TEGRA=y diff --git a/config-armv7-generic b/config-armv7-generic index b436c53..3fb1b00 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -60,6 +60,9 @@ CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y # CONFIG_ARCH_U8500 is not set # CONFIG_ARCH_WM8850 is not set # CONFIG_ARCH_SHMOBILE_MULTI is not set +# CONFIG_ARCH_BERLIN is not set +# CONFIG_ARCH_HI3xxx is not set +# CONFIG_ARCH_MSM_DT is not set # highbank CONFIG_EDAC_HIGHBANK_MC=m diff --git a/config-armv7-lpae b/config-armv7-lpae index fa36ef1..1244aa8 100644 --- a/config-armv7-lpae +++ b/config-armv7-lpae @@ -112,6 +112,7 @@ CONFIG_SAMSUNG_USBPHY=m CONFIG_SAMSUNG_USB2PHY=m CONFIG_SAMSUNG_USB3PHY=m # CONFIG_KEYSTONE_USB_PHY is not set +# CONFIG_GPIO_DAVINCI is not set CONFIG_MMC_DW_EXYNOS=m CONFIG_RTC_DRV_S3C=m diff --git a/config-generic b/config-generic index a78a9f6..239ea05 100644 --- a/config-generic +++ b/config-generic @@ -2785,6 +2785,7 @@ CONFIG_RTC_DRV_DS3232=m CONFIG_RTC_DRV_ISL12022=m # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set # CONFIG_RTC_DRV_MOXART is not set +# CONFIG_RTC_DRV_ISL12057 is not set CONFIG_R3964=m # CONFIG_APPLICOM is not set @@ -5070,6 +5071,8 @@ CONFIG_PSTORE_RAM=m # CONFIG_PSTORE_CONSOLE is not set # CONFIG_PSTORE_FTRACE is not set +# CONFIG_TEST_MODULE is not set +# CONFIG_TEST_USER_COPY is not set # CONFIG_AVERAGE is not set # CONFIG_VMXNET3 is not set diff --git a/config-powerpc-generic b/config-powerpc-generic index a2f0dcf..bcc30fe 100644 --- a/config-powerpc-generic +++ b/config-powerpc-generic @@ -321,6 +321,7 @@ CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m # CONFIG_PPC_MPC512x is not set # CONFIG_RTC_DRV_MPC5121 is not set +# CONFIG_RTC_DRV_HYM8563 is not set # CONFIG_MPC512X_DMA is not set diff --git a/config-x86-32-generic b/config-x86-32-generic index 9e56a2b..21fe6fe 100644 --- a/config-x86-32-generic +++ b/config-x86-32-generic @@ -224,6 +224,7 @@ CONFIG_BACKLIGHT_PWM=m # CONFIG_GPIO_ADNP is not set # CONFIG_BACKLIGHT_OT200 is not set # CONFIG_RTC_DRV_SNVS is not set +# CONFIG_RTC_DRV_HYM8563 is not set # CONFIG_OF_DISPLAY_TIMING is not set # CONFIG_OF_VIDEOMODE is not set @@ -231,3 +232,5 @@ CONFIG_BACKLIGHT_PWM=m # CONFIG_PINCTRL_SINGLE is not set # CONFIG_PINCTRL_CAPRI is not set # CONFIG_PINCTRL_MSM8X74 is not set +# CONFIG_COMMON_CLK_SI570 is not set +# CONFIG_COMMON_CLK_QCOM is not set diff --git a/config-x86-generic b/config-x86-generic index 5136feb..53d463d 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -115,6 +115,9 @@ CONFIG_NVRAM=y CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +CONFIG_CRYPTO_DEV_CCP=y +CONFIG_CRYPTO_DEV_CCP_DD=m +CONFIG_CRYPTO_DEV_CCP_CRYPTO=m CONFIG_GENERIC_ISA_DMA=y diff --git a/fs-proc-devtree-remove_proc_entry.patch b/fs-proc-devtree-remove_proc_entry.patch deleted file mode 100644 index 2a959fd..0000000 --- a/fs-proc-devtree-remove_proc_entry.patch +++ /dev/null @@ -1,15 +0,0 @@ -Bugzilla: 818378 -Upstream-status: Sent upstream by Davej in 2012. Pinged again on Dec 17, 2013 - -diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c -index 927cbd1..f060f28 100644 ---- a/fs/proc/proc_devtree.c -+++ b/fs/proc/proc_devtree.c -@@ -233,6 +233,7 @@ void __init proc_device_tree_init(void) - return; - root = of_find_node_by_path("/"); - if (root == NULL) { -+ remove_proc_entry("device-tree", NULL); - pr_debug("/proc/device-tree: can't find root\n"); - return; - } diff --git a/kernel.spec b/kernel.spec index 373496a..fad8ab0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -61,7 +61,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 7 +%define gitrev 8 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -576,8 +576,6 @@ Patch1826: drm-i915-hush-check-crtc-state.patch # NFSv4 # patches headed upstream -Patch10000: fs-proc-devtree-remove_proc_entry.patch - Patch12016: disable-i8042-check-on-apple-mac.patch Patch14000: hibernate-freeze-filesystems.patch @@ -1260,8 +1258,6 @@ ApplyPatch drm-i915-hush-check-crtc-state.patch # Radeon DRM # Patches headed upstream -ApplyPatch fs-proc-devtree-remove_proc_entry.patch - ApplyPatch disable-i8042-check-on-apple-mac.patch # FIXME: REBASE @@ -2094,6 +2090,9 @@ fi # ||----w | # || || %changelog +* Fri Jan 24 2014 Josh Boyer - 3.14.0-0.rc0.git8.1 +- Linux v3.13-5617-g3aacd62 + * Thu Jan 23 2014 Josh Boyer - 3.14.0-0.rc0.git7.1 - Linux v3.13-4156-g90804ed diff --git a/sources b/sources index 95bb226..a6cc6d3 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 0ecbaf65c00374eb4a826c2f9f37606f linux-3.13.tar.xz 732d1952898b28d5ccc264cad77b0619 perf-man-3.13.tar.gz -3cbc5237b69383516f74dc8c68867058 patch-3.13-git7.xz +14d8805fe0e54d5d7b7d1c4b20c20f16 patch-3.13-git8.xz