diff --git a/config-armv7-generic b/config-armv7-generic index f1d7bf040..56c372b95 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -214,6 +214,8 @@ CONFIG_USB_CONFIGFS_OBEX=y # CONFIG_USB_CONFIGFS_RNDIS is not set CONFIG_USB_CONFIGFS_SERIAL=y CONFIG_USB_CONFIGFS_STORAGE=y +# CONFIG_USB_CONFIGFS_F_LB_SS is not set +# CONFIG_USB_CONFIGFS_F_FS is not set # CONFIG_MUSB_PIO_ONLY is not set # CONFIG_USB_MUSB_DEBUG is not set @@ -355,6 +357,7 @@ CONFIG_USB_DWC3_OMAP=m CONFIG_USB_DWC3_EXYNOS=m CONFIG_USB_DWC3_PCI=m # CONFIG_USB_DWC3_DEBUG is not set +# CONFIG_USB_DWC3_KEYSTONE is not set CONFIG_DW_WATCHDOG=m CONFIG_PCIE_DW=y CONFIG_PCI_EXYNOS=y @@ -587,3 +590,4 @@ CONFIG_BPF_JIT=y # FIX ME # CONFIG_FB_XILINX is not set +# CONFIG_USB_S3C_HSOTG is not set diff --git a/config-armv7-lpae b/config-armv7-lpae index c3b22bcdf..a67ea1aea 100644 --- a/config-armv7-lpae +++ b/config-armv7-lpae @@ -110,6 +110,7 @@ CONFIG_USB_EHCI_S5P=y CONFIG_SAMSUNG_USBPHY=m CONFIG_SAMSUNG_USB2PHY=m CONFIG_SAMSUNG_USB3PHY=m +# CONFIG_KEYSTONE_USB_PHY is not set CONFIG_MMC_DW_EXYNOS=m CONFIG_RTC_DRV_S3C=m diff --git a/config-generic b/config-generic index ac5b7c620..a2b849e55 100644 --- a/config-generic +++ b/config-generic @@ -664,7 +664,7 @@ CONFIG_FIREWIRE_SBP2=m CONFIG_FIREWIRE_NET=m CONFIG_FIREWIRE_OHCI_DEBUG=y CONFIG_FIREWIRE_NOSY=m -CONFIG_FIREWIRE_SERIAL=m +# CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # @@ -2535,6 +2535,7 @@ CONFIG_HID_SENSOR_ENUM_BASE_QUIRKS=y # CONFIG_MCP4725 is not set # CONFIG_ITG3200 is not set # CONFIG_APDS9300 is not set +# CONFIG_CM32181 is not set # CONFIG_CM36651 is not set # CONFIG_GP2AP020A00F is not set # CONFIG_TSL2583 is not set @@ -2549,6 +2550,7 @@ CONFIG_HID_SENSOR_ENUM_BASE_QUIRKS=y CONFIG_IIO_ST_GYRO_3AXIS=m CONFIG_IIO_ST_MAGN_3AXIS=m CONFIG_IIO_ST_ACCEL_3AXIS=m +CONFIG_HID_SENSOR_INCLINOMETER_3D=m # CONFIG_ADJD_S311 is not set # CONFIG_SENSORS_TSL2563 is not set # CONFIG_VCNL4000 is not set @@ -2586,6 +2588,8 @@ CONFIG_IIO_ST_ACCEL_3AXIS=m # CONFIG_ADXRS450 is not set # CONFIG_ADIS16400 is not set # CONFIG_ADIS16480 is not set +# CONFIG_DHT11 is not set +# CONFIG_MPL3115 is not set # staging IIO drivers # CONFIG_AD7291 is not set @@ -3418,6 +3422,7 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_ISP1362_HCD=m CONFIG_USB_FUSBH200_HCD=m # CONFIG_USB_FOTG210_HCD is not set +# CONFIG_USB_GR_UDC is not set CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD_PCI=y # CONFIG_USB_OHCI_HCD_SSB is not set @@ -3733,6 +3738,7 @@ CONFIG_USB_SERIAL_MOS7715_PARPORT=y # CONFIG_USB_SERIAL_ZTE is not set CONFIG_USB_SERIAL_MOS7840=m CONFIG_USB_SERIAL_MOTOROLA=m +# CONFIG_USB_SERIAL_MXUPORT is not set CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_SERIAL_OTI6858=m @@ -3776,6 +3782,7 @@ CONFIG_USB_APPLEDISPLAY=m # Physical Layer USB driver CONFIG_USB_PHY=y +# CONFIG_USB_OTG_FSM is not set # CONFIG_GENERIC_PHY is not set # CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set @@ -3787,6 +3794,7 @@ CONFIG_USB_PHY=y # CONFIG_SAMSUNG_USBPHY is not set # CONFIG_SAMSUNG_USB2PHY is not set # CONFIG_SAMSUNG_USB3PHY is not set +# CONFIG_BCM_KONA_USB2_PHY is not set CONFIG_USB_RCAR_PHY=m CONFIG_USB_ATM=m CONFIG_USB_CXACRU=m @@ -4912,6 +4920,7 @@ CONFIG_ALTERA_STAPL=m # CONFIG_XILLYBUS is not set # CONFIG_DGAP is not set # CONFIG_DGNC is not set +# CONFIG_RTS5208 is not set # END OF STAGING # @@ -5089,10 +5098,14 @@ CONFIG_FMC_TRIVIAL=m CONFIG_FMC_WRITE_EEPROM=m CONFIG_FMC_CHARDEV=m +# CONFIG_GENWQE is not set + # CONFIG_POWERCAP is not set # CONFIG_HSI is not set +# CONFIG_CPU_IDLE is not set + # CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set # CONFIG_PM_DEVFREQ is not set diff --git a/kernel.spec b/kernel.spec index 1b5c4cc0f..7a4c6492a 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 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -2096,6 +2096,9 @@ fi # ||----w | # || || %changelog +* Wed Jan 22 2014 Josh Boyer - 3.14.0-0.rc0.git2.1 +- Linux v3.13-2502-gec513b1 + * Tue Jan 21 2014 Josh Boyer - 3.14.0-0.rc0.git1.1 - Linux v3.13-737-g7fe67a1 - Reenable debugging options. Enable SLUB_DEBUG diff --git a/sources b/sources index ee41703ab..bcf89c666 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 0ecbaf65c00374eb4a826c2f9f37606f linux-3.13.tar.xz 732d1952898b28d5ccc264cad77b0619 perf-man-3.13.tar.gz -eedf25215e15e77a96c6e1f7d0987294 patch-3.13-git1.xz +f30a544506ee2ff8349a9b87df6a55cc patch-3.13-git2.xz diff --git a/sysrq-secure-boot.patch b/sysrq-secure-boot.patch index 0a93e8891..c73e3d252 100644 --- a/sysrq-secure-boot.patch +++ b/sysrq-secure-boot.patch @@ -1,23 +1,23 @@ Bugzilla: N/A Upstream-status: Fedora mustard -From 71aac34ed679daa0bf772051eb40412b5bd95da3 Mon Sep 17 00:00:00 2001 +From 29c1f71a2d0845a71ea2ebd2fb33542373dc52dd Mon Sep 17 00:00:00 2001 From: Kyle McMartin Date: Fri, 30 Aug 2013 09:28:51 -0400 Subject: [PATCH] Add sysrq option to disable secure boot mode --- - arch/x86/kernel/setup.c | 35 +++++++++++++++++++++++++++++++++++ + arch/x86/kernel/setup.c | 36 ++++++++++++++++++++++++++++++++++++ drivers/input/misc/uinput.c | 1 + drivers/tty/sysrq.c | 19 +++++++++++++------ include/linux/input.h | 5 +++++ include/linux/sysrq.h | 8 +++++++- kernel/debug/kdb/kdb_main.c | 2 +- kernel/module.c | 4 ++-- - 7 files changed, 64 insertions(+), 10 deletions(-) + 7 files changed, 65 insertions(+), 10 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index 08dc16e..6971f8e 100644 +index c773add..92c480c 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -70,6 +70,11 @@ @@ -32,11 +32,10 @@ index 08dc16e..6971f8e 100644 #include