From c2b217b23eff35e6d4ce8d353705e9323787dff7 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Tue, 30 Apr 2013 08:32:29 -0400 Subject: [PATCH] Linux v3.9-3143-g56847d8 --- config-armv7 | 2 ++ config-armv7-generic | 2 ++ config-armv7-tegra | 3 +++ config-generic | 4 ++++ config-x86-generic | 1 + kernel.spec | 5 ++++- sources | 2 +- 7 files changed, 17 insertions(+), 2 deletions(-) diff --git a/config-armv7 b/config-armv7 index 4f27e5c06..d165190a8 100644 --- a/config-armv7 +++ b/config-armv7 @@ -496,3 +496,5 @@ CONFIG_REGULATOR_LP8755=m # CONFIG_POWER_RESET_QNAP is not set # CONFIG_POWER_RESET_RESTART is not set # CONFIG_OMAP2_DSS_DEBUG is not set +# CONFIG_COMMON_CLK_SI5351 is not set +# CONFIG_COMMON_CLK_AXI_CLKGEN is not set diff --git a/config-armv7-generic b/config-armv7-generic index 9effa1071..6aaebbdf6 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -236,6 +236,7 @@ CONFIG_SPI_XCOMM=m CONFIG_SPI_XILINX=m CONFIG_SPI_DESIGNWARE=m CONFIG_SPI_TLE62X0=m +# CONFIG_SPI_FSL_SPI is not set # HW crypto and rng CONFIG_CRYPTO_SHA1_ARM=m @@ -346,6 +347,7 @@ CONFIG_SENSORS_GPIO_FAN=m CONFIG_LCD_L4F00242T03=m CONFIG_LCD_LMS283GF05=m CONFIG_LCD_LTV350QV=m +CONFIG_LCD_ILI922X=m CONFIG_LCD_ILI9320=m CONFIG_LCD_TDO24M=m CONFIG_LCD_VGG2432A4=m diff --git a/config-armv7-tegra b/config-armv7-tegra index 20cda8a7b..eb489dbdb 100644 --- a/config-armv7-tegra +++ b/config-armv7-tegra @@ -39,6 +39,7 @@ CONFIG_TEGRA_SYSTEM_DMA=y CONFIG_TEGRA_EMC_SCALING_ENABLE=y CONFIG_TEGRA_AHB=y CONFIG_TEGRA20_APB_DMA=y +CONFIG_SPI_TEGRA114=m CONFIG_SPI_TEGRA20_SFLASH=m CONFIG_SPI_TEGRA20_SLINK=m @@ -74,6 +75,8 @@ CONFIG_NVEC_PAZ00=y CONFIG_PWM_TEGRA=m +# CONFIG_COMMON_CLK_SI5351 is not set + CONFIG_CMA=y # CONFIG_CMA_DEBUG is not set CONFIG_CMA_SIZE_MBYTES=16 diff --git a/config-generic b/config-generic index 6ef80f2f8..3e96d3694 100644 --- a/config-generic +++ b/config-generic @@ -2398,6 +2398,7 @@ CONFIG_SENSORS_MAX197=m # CONFIG_PCH_PHUB is not set # CONFIG_SERIAL_PCH_UART is not set # CONFIG_USB_SWITCH_FSA9480 is not set +# CONFIG_SRAM is not set CONFIG_SERIAL_ARC=m CONFIG_SERIAL_ARC_NR_PORTS=1 # CONFIG_SERIAL_RP2 is not set @@ -4268,6 +4269,7 @@ CONFIG_SND_INDIGODJX=m CONFIG_BALLOON_COMPACTION=y CONFIG_COMPACTION=y CONFIG_MIGRATION=y +CONFIG_BOUNCE=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y # CONFIG_LEDS_AMS_DELTA is not set @@ -4327,12 +4329,14 @@ CONFIG_DYNAMIC_FTRACE=y CONFIG_SCHED_TRACER=y CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_TRACER_SNAPSHOT=y +# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set # CONFIG_TRACE_BRANCH_PROFILING is not set CONFIG_FUNCTION_PROFILER=y CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RBTREE_TEST is not set # CONFIG_INTERVAL_TREE_TEST is not set CONFIG_FUNCTION_TRACER=y diff --git a/config-x86-generic b/config-x86-generic index f661f4432..398d4209c 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -420,6 +420,7 @@ CONFIG_HID_HYPERV_MOUSE=m CONFIG_HYPERV_NET=m CONFIG_HYPERV_STORAGE=m CONFIG_HYPERV_BALLOON=m +CONFIG_FB_HYPERV=m # Depends on HOTPLUG_PCI_PCIE CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m diff --git a/kernel.spec b/kernel.spec index 8c8cddea8..e60bc5d06 100644 --- a/kernel.spec +++ b/kernel.spec @@ -95,7 +95,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -2290,6 +2290,9 @@ fi # ||----w | # || || %changelog +* Tue Apr 30 2013 Josh Boyer - 3.10.0-0.rc0.git4.1 +- Linux v3.9-3143-g56847d8 + * Mon Apr 29 2013 Josh Boyer - 3.10.0-0.rc0.git3.1 - Linux v3.9-2154-gec25e24 diff --git a/sources b/sources index ee611599a..cf3636a03 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 4348c9b6b2eb3144d601e87c19d5d909 linux-3.9.tar.xz -d3d3356767f4d9566576a6c37fb81bde patch-3.9-git3.xz +60c488542da8362dc70bc28ece41119d patch-3.9-git4.xz