Linux v3.10-6005-gd2b4a64

21 files changed, 147 insertions, 322 deletions

diff --git a/HID-input-return-ENODATA-if-reading-battery-attrs-fails.patch b/HID-input-return-ENODATA-if-reading-battery-attrs-fails.patch
deleted file mode 100644
index acdd66d48..000000000
--- a/HID-input-return-ENODATA-if-reading-battery-attrs-fails.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From d0a934b764c67b4bf626f5b7cf725a6e3066afd2 Mon Sep 17 00:00:00 2001
-From: David Herrmann <dh.herrmann@gmail.com>
-Date: Mon, 13 May 2013 15:01:30 +0000
-Subject: HID: input: return ENODATA if reading battery attrs fails
-
-power_supply core has the bad habit of calling our battery callbacks
-from within power_supply_register(). Furthermore, if the callbacks
-fail with an unhandled error code, it will skip any uevent that it
-might currently process.
-So if HID-core registers battery devices, an "add" uevent is generated
-and the battery callbacks are called. These will gracefully fail due
-to timeouts as they might still hold locks on event processing. One
-could argue that this should be fixed in power_supply core, but the
-least we can do is to signal ENODATA so power_supply core will just
-skip the property and continue with the uevent.
-
-This fixes a bug where "add" and "remove" uevents are skipped for
-battery devices. upower is unable to track these devices and currently
-needs to ignore them.
-
-This patch also overwrites any other error code. I cannot see any reason
-why we should forward protocol- or I/O-errors to the power_supply core.
-We handle these errors in hid_ll_driver later, anyway, so just skip
-them. power_supply core cannot do anything useful with them, anyway,
-and we avoid skipping important uevents and confusing user-space.
-
-Thanks a lot to Daniel Nicoletti for pushing and investigating
-on this.
-
-Cc: Jiri Kosina <jkosina@suse.cz>
-Cc: Anton Vorontsov <cbou@mail.ru>
-Cc: David Woodhouse <dwmw2@infradead.org>
-Reported-by: Daniel Nicoletti <dantti12@gmail.com>
-Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
-Signed-off-by: Jiri Kosina <jkosina@suse.cz>
----
-diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
-index 945b815..c526a3c 100644
---- a/drivers/hid/hid-input.c
-+++ b/drivers/hid/hid-input.c
-@@ -354,10 +354,10 @@ static int hidinput_get_battery_property(struct power_supply *psy,
- 					      dev->battery_report_type);
- 
- 		if (ret != 2) {
--			if (ret >= 0)
--				ret = -EINVAL;
-+			ret = -ENODATA;
- 			break;
- 		}
-+		ret = 0;
- 
- 		if (dev->battery_min < dev->battery_max &&
- 		    buf[1] >= dev->battery_min &&
---
-cgit v0.9.2
diff --git a/KVM-x86-handle-idiv-overflow-at-kvm_write_tsc.patch b/KVM-x86-handle-idiv-overflow-at-kvm_write_tsc.patch
deleted file mode 100644
index 678e82953..000000000
--- a/KVM-x86-handle-idiv-overflow-at-kvm_write_tsc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index 094b5d9..64a4b03 100644
---- a/arch/x86/kvm/x86.c
-+++ b/arch/x86/kvm/x86.c
-@@ -1194,20 +1194,37 @@ void kvm_write_tsc(struct kvm_vcpu *vcpu, struct msr_data *msr)
- 	elapsed = ns - kvm->arch.last_tsc_nsec;
- 
- 	if (vcpu->arch.virtual_tsc_khz) {
-+		int faulted = 0;
-+
- 		/* n.b - signed multiplication and division required */
- 		usdiff = data - kvm->arch.last_tsc_write;
- #ifdef CONFIG_X86_64
- 		usdiff = (usdiff * 1000) / vcpu->arch.virtual_tsc_khz;
- #else
- 		/* do_div() only does unsigned */
--		asm("idivl %2; xor %%edx, %%edx"
--		: "=A"(usdiff)
--		: "A"(usdiff * 1000), "rm"(vcpu->arch.virtual_tsc_khz));
-+		asm("1: idivl %[divisor]\n"
-+		    "2: xor %%edx, %%edx\n"
-+		    "   movl $0, %[faulted]\n"
-+		    "3:\n"
-+		    ".section .fixup,\"ax\"\n"
-+		    "4: movl $1, %[faulted]\n"
-+		    "   jmp  3b\n"
-+		    ".previous\n"
-+
-+		_ASM_EXTABLE(1b, 4b)
-+
-+		: "=A"(usdiff), [faulted] "=r" (faulted)
-+		: "A"(usdiff * 1000), [divisor] "rm"(vcpu->arch.virtual_tsc_khz));
-+
- #endif
- 		do_div(elapsed, 1000);
- 		usdiff -= elapsed;
- 		if (usdiff < 0)
- 			usdiff = -usdiff;
-+
-+		/* idivl overflow => difference is larger than USEC_PER_SEC */
-+		if (faulted)
-+			usdiff = USEC_PER_SEC;
- 	} else
- 		usdiff = USEC_PER_SEC; /* disable TSC match window below */
- 
diff --git a/Makefile b/Makefile
index 2a87029f7..178f4f2e5 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,7 @@ debug:
 	@perl -pi -e 's/# CONFIG_DEBUG_STACK_USAGE is not set/CONFIG_DEBUG_STACK_USAGE=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_SLAB is not set/CONFIG_DEBUG_SLAB=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_MUTEXES is not set/CONFIG_DEBUG_MUTEXES=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set/CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_RT_MUTEXES is not set/CONFIG_DEBUG_RT_MUTEXES=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_LOCK_ALLOC is not set/CONFIG_DEBUG_LOCK_ALLOC=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_PROVE_LOCKING is not set/CONFIG_PROVE_LOCKING=y/' config-nodebug
@@ -90,6 +91,7 @@ debug:
 	@perl -pi -e 's/# CONFIG_DETECT_HUNG_TASK is not set/CONFIG_DETECT_HUNG_TASK=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set/CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_KMEMLEAK is not set/CONFIG_DEBUG_KMEMLEAK=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set/CONFIG_X86_DEBUG_STATIC_CPU_HAS=y/' config-nodebug
 
 	@# just in case we're going from extremedebug -> debug
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
diff --git a/Makefile.release b/Makefile.release
index 3eba9dbac..d58063443 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -11,6 +11,7 @@ config-release:
 	@perl -pi -e 's/CONFIG_DEBUG_STACK_USAGE=y/# CONFIG_DEBUG_STACK_USAGE is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_SLAB=y/# CONFIG_DEBUG_SLAB is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_MUTEXES=y/# CONFIG_DEBUG_MUTEXES is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y/# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_RT_MUTEXES=y/# CONFIG_DEBUG_RT_MUTEXES is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_LOCK_ALLOC=y/# CONFIG_DEBUG_LOCK_ALLOC is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_PROVE_LOCKING=y/# CONFIG_PROVE_LOCKING is not set/' config-nodebug
@@ -73,6 +74,7 @@ config-release:
 	@perl -pi -e 's/CONFIG_XFS_WARN=y/# CONFIG_XFS_WARN is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_EDAC_DEBUG=y/# CONFIG_EDAC_DEBUG is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_RTLWIFI_DEBUG=y/# CONFIG_RTLWIFI_DEBUG is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_X86_DEBUG_STATIC_CPU_HAS=y/# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set/' config-nodebug
 
 	@# Undo anything that make extremedebug might have set
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-debug
diff --git a/arm64-makefile-vdso_install.patch b/arm64-makefile-vdso_install.patch
deleted file mode 100644
index f7b4d122b..000000000
--- a/arm64-makefile-vdso_install.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
-index c95c5cb..b6ccf8a 100644
---- a/arch/arm64/Makefile
-+++ b/arch/arm64/Makefile
-@@ -60,6 +60,10 @@ zinstall install: vmlinux
- dtbs: scripts
- 	$(Q)$(MAKE) $(build)=$(boot)/dts dtbs
- 
-+PHONY += vdso_install
-+vdso_install:
-+	$(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@
-+
- # We use MRPROPER_FILES and CLEAN_FILES now
- archclean:
- 	$(Q)$(MAKE) $(clean)=$(boot)
diff --git a/block-do-not-pass-disk-names-as-format-strings.patch b/block-do-not-pass-disk-names-as-format-strings.patch
deleted file mode 100644
index 496111dcd..000000000
--- a/block-do-not-pass-disk-names-as-format-strings.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Disk names may contain arbitrary strings, so they must not be interpreted
-as format strings. It seems that only md allows arbitrary strings to be
-used for disk names, but this could allow for a local memory corruption
-from uid 0 into ring 0.
-
-CVE-2013-2851
-
-Signed-off-by: Kees Cook <keescook@chromium.org>
-Cc: stable@vger.kernel.org
-Cc: Jens Axboe <axboe@kernel.dk>
----
- block/genhd.c              |    2 +-
- drivers/block/nbd.c        |    3 ++-
- drivers/scsi/osd/osd_uld.c |    2 +-
- 3 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/block/genhd.c b/block/genhd.c
-index 20625ee..cdeb527 100644
---- a/block/genhd.c
-+++ b/block/genhd.c
-@@ -512,7 +512,7 @@ static void register_disk(struct gendisk *disk)
- 
- 	ddev->parent = disk->driverfs_dev;
- 
--	dev_set_name(ddev, disk->disk_name);
-+	dev_set_name(ddev, "%s", disk->disk_name);
- 
- 	/* delay uevents, until we scanned partition table */
- 	dev_set_uevent_suppress(ddev, 1);
-diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
-index 037288e..46b35f7 100644
---- a/drivers/block/nbd.c
-+++ b/drivers/block/nbd.c
-@@ -714,7 +714,8 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
- 		else
- 			blk_queue_flush(nbd->disk->queue, 0);
- 
--		thread = kthread_create(nbd_thread, nbd, nbd->disk->disk_name);
-+		thread = kthread_create(nbd_thread, nbd, "%s",
-+					nbd->disk->disk_name);
- 		if (IS_ERR(thread)) {
- 			mutex_lock(&nbd->tx_lock);
- 			return PTR_ERR(thread);
-diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c
-index 0fab6b5..9d86947 100644
---- a/drivers/scsi/osd/osd_uld.c
-+++ b/drivers/scsi/osd/osd_uld.c
-@@ -485,7 +485,7 @@ static int osd_probe(struct device *dev)
- 	oud->class_dev.class = &osd_uld_class;
- 	oud->class_dev.parent = dev;
- 	oud->class_dev.release = __remove;
--	error = dev_set_name(&oud->class_dev, disk->disk_name);
-+	error = dev_set_name(&oud->class_dev, "%s", disk->disk_name);
- 	if (error) {
- 		OSD_ERR("dev_set_name failed => %d\n", error);
- 		goto err_put_cdev;
--- 
-1.7.9.5
-
---
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at  http://www.tux.org/lkml/
\ No newline at end of file
diff --git a/cdrom-use-kzalloc-for-failing-hardware.patch b/cdrom-use-kzalloc-for-failing-hardware.patch
deleted file mode 100644
index 6afb6c4d8..000000000
--- a/cdrom-use-kzalloc-for-failing-hardware.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 050e4b8fb7cdd7096c987a9cd556029c622c7fe2 Mon Sep 17 00:00:00 2001
-From: Jonathan Salwan <jonathan.salwan@gmail.com>
-Date: Thu, 06 Jun 2013 00:39:39 +0000
-Subject: drivers/cdrom/cdrom.c: use kzalloc() for failing hardware
-
-In drivers/cdrom/cdrom.c mmc_ioctl_cdrom_read_data() allocates a memory
-area with kmalloc in line 2885.
-
-2885         cgc->buffer = kmalloc(blocksize, GFP_KERNEL);
-2886         if (cgc->buffer == NULL)
-2887                 return -ENOMEM;
-
-In line 2908 we can find the copy_to_user function:
-
-2908         if (!ret && copy_to_user(arg, cgc->buffer, blocksize))
-
-The cgc->buffer is never cleaned and initialized before this function.  If
-ret = 0 with the previous basic block, it's possible to display some
-memory bytes in kernel space from userspace.
-
-When we read a block from the disk it normally fills the ->buffer but if
-the drive is malfunctioning there is a chance that it would only be
-partially filled.  The result is an leak information to userspace.
-
-Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
-Cc: Jens Axboe <axboe@kernel.dk>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
----
-(limited to 'drivers/cdrom/cdrom.c')
-
-diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
-index d620b44..8a3aff7 100644
---- a/drivers/cdrom/cdrom.c
-+++ b/drivers/cdrom/cdrom.c
-@@ -2882,7 +2882,7 @@ static noinline int mmc_ioctl_cdrom_read_data(struct cdrom_device_info *cdi,
- 	if (lba < 0)
- 		return -EINVAL;
- 
--	cgc->buffer = kmalloc(blocksize, GFP_KERNEL);
-+	cgc->buffer = kzalloc(blocksize, GFP_KERNEL);
- 	if (cgc->buffer == NULL)
- 		return -ENOMEM;
- 
---
-cgit v0.9.2
diff --git a/config-arm-generic b/config-arm-generic
index efce65434..e00b2501d 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -5,6 +5,7 @@ CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_GIC=y
 # CONFIG_ASYMMETRIC_KEY_TYPE is not set
 CONFIG_BACKLIGHT_PWM=m
+# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 # CONFIG_COMMON_CLK_DEBUG is not set
 CONFIG_COMMON_CLK=y
 CONFIG_DMA_OF=y
@@ -39,5 +40,8 @@ CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_RTC_DRV_SNVS is not set
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIO_OLPC_APSP=m
 
 # CONFIG_CRYPTO_TEST is not set
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
+# CONFIG_XEN is not set
diff --git a/config-arm64 b/config-arm64
index 8bac90936..efeb8c377 100644
--- a/config-arm64
+++ b/config-arm64
@@ -14,6 +14,7 @@ CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_ARCH_XGENE=y
 CONFIG_ARM64_64K_PAGES=y
 CONFIG_ARM64=y
 # CONFIG_ARM_DT_BL_CPUFREQ is not set
diff --git a/config-armv7 b/config-armv7
index 1bbb3d524..7d9b2d928 100644
--- a/config-armv7
+++ b/config-armv7
@@ -637,3 +637,25 @@ CONFIG_REGULATOR_LP8755=m
 # CONFIG_DRM_TEGRA_DEBUG is not set
 # CONFIG_CRYPTO_DEV_UX500_DEBUG is not set
 # CONFIG_AB8500_DEBUG is not set
+
+# FIX ME
+# CONFIG_ARCH_KEYSTONE is not set
+# CONFIG_SOC_IMX6SL is not set
+# CONFIG_SOC_VF610 is not set
+# CONFIG_SOC_AM43XX is not set
+# CONFIG_ARCH_ROCKCHIP is not set
+# CONFIG_ARCH_STI is not set
+# CONFIG_PCI_MVEBU is not set
+# CONFIG_ARM_TEGRA_CPUFREQ is not set
+# CONFIG_IMX_WEIM is not set
+# CONFIG_ARM_CCI is not set
+# CONFIG_SERIAL_UARTLITE is not set
+# CONFIG_GPIO_XILINX is not set
+# CONFIG_REGULATOR_TI_ABB is not set
+# CONFIG_SND_SOC_IMX_WM8962 is not set
+# CONFIG_SND_SOC_TEGRA_RT5640 is not set
+# CONFIG_TI_EDMA is not set
+# CONFIG_TI_SOC_THERMAL is not set
+# CONFIG_DRM_IMX_LDB is not set
+# CONFIG_OMAP2PLUS_MBOX is not set
+# CONFIG_CRYPTO_DEV_SAHARA is not set
diff --git a/config-armv7-generic b/config-armv7-generic
index 897a7e3ee..36acf2224 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -106,6 +106,7 @@ CONFIG_OC_ETM=y
 
 CONFIG_PM=y
 CONFIG_PM_STD_PARTITION=""
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_SUSPEND=y
 CONFIG_ARM_CPU_SUSPEND=y
 
diff --git a/config-armv7-lpae b/config-armv7-lpae
index f17b8616a..87bbc48be 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -52,11 +52,14 @@ CONFIG_S3C24XX_PWM=y
 # CONFIG_SAMSUNG_PM_DEBUG is not set
 # CONFIG_SAMSUNG_PM_CHECK is not set
 CONFIG_SOC_EXYNOS5250=y
+CONFIG_SOC_EXYNOS5420=y
 CONFIG_SOC_EXYNOS5440=y
 CONFIG_ARM_EXYNOS_CPUFREQ=y
 # CONFIG_GENERIC_CPUFREQ_CPU0 is not set
 CONFIG_EXYNOS_THERMAL=m
+CONFIG_PCI_EXYNOS=y
 
+CONFIG_ARM_CCI=y
 CONFIG_TCG_TIS_I2C_INFINEON=m
 CONFIG_I2C_S3C2410=m
 CONFIG_PINCTRL_EXYNOS=y
@@ -125,3 +128,5 @@ CONFIG_COMMON_CLK_MAX77686=m
 
 # CONFIG_EXYNOS4_SDHCI_CH0_8BIT is not set
 # CONFIG_EXYNOS4_SDHCI_CH2_8BIT is not set
+
+# CONFIG_SGI_IOC4 is not set
diff --git a/config-debug b/config-debug
index 5df2cd620..450c05f75 100644
--- a/config-debug
+++ b/config-debug
@@ -5,6 +5,7 @@ CONFIG_SND_PCM_XRUN_DEBUG=y
 CONFIG_DEBUG_ATOMIC_SLEEP=y
 
 CONFIG_DEBUG_MUTEXES=y
+CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y
@@ -120,3 +121,5 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 CONFIG_MAC80211_MESSAGE_TRACING=y
 
 CONFIG_EDAC_DEBUG=y
+
+CONFIG_X86_DEBUG_STATIC_CPU_HAS=y
diff --git a/config-generic b/config-generic
index 08cfec463..48d14bad9 100644
--- a/config-generic
+++ b/config-generic
@@ -35,6 +35,7 @@ CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_COMPILE_TEST is not set
 CONFIG_FHANDLE=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
@@ -515,6 +516,7 @@ CONFIG_SATA_NV=m
 CONFIG_SATA_PMP=y
 CONFIG_SATA_PROMISE=m
 CONFIG_SATA_QSTOR=m
+CONFIG_SATA_RCAR=m
 CONFIG_SATA_SIL=m
 CONFIG_SATA_SIL24=m
 CONFIG_SATA_SIS=m
@@ -1571,13 +1573,13 @@ CONFIG_B43_SDIO=y
 CONFIG_B43_BCMA=y
 # CONFIG_B43_BCMA_EXTRA is not set
 CONFIG_B43_BCMA_PIO=y
-# CONFIG_B43_DEBUG is not set
+CONFIG_B43_DEBUG=y
 CONFIG_B43_PHY_LP=y
 CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_HT=y
 # CONFIG_B43_FORCE_PIO is not set
 CONFIG_B43LEGACY=m
-# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DEBUG=y
 CONFIG_B43LEGACY_DMA=y
 CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
@@ -2003,6 +2005,7 @@ CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_APBPS2 is not set
 
 # CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_OLPC_APSP is not set
 # CONFIG_SERIO_PARKBD is not set
 # CONFIG_SERIO_PCIPS2 is not set
 
@@ -2080,6 +2083,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_AD7879_I2C=m
 # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
 # CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
+# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_EDT_FT5X06=m
 CONFIG_TOUCHSCREEN_EETI=m
@@ -2307,6 +2311,7 @@ CONFIG_SENSORS_F71882FG=m
 CONFIG_SENSORS_F75375S=m
 CONFIG_SENSORS_FSCHMD=m
 CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_HDAPS=m
@@ -2426,6 +2431,7 @@ CONFIG_SENSORS_MAX197=m
 CONFIG_SERIAL_ARC=m
 CONFIG_SERIAL_ARC_NR_PORTS=1
 # CONFIG_SERIAL_RP2 is not set
+# CONFIG_SERIAL_FSL_LPUART is not set
 
 CONFIG_W1=m
 CONFIG_W1_CON=y
@@ -2535,6 +2541,7 @@ CONFIG_RTC_DRV_M41T80_WDT=y
 CONFIG_RTC_DRV_M48T59=m
 CONFIG_RTC_DRV_MAX6900=m
 # CONFIG_RTC_DRV_M48T86 is not set
+CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
@@ -3019,6 +3026,7 @@ CONFIG_SND_PCM_OSS=y
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_RTCTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
 # CONFIG_SND_SUPPORT_OLD_API is not set
 
 #
@@ -3141,6 +3149,7 @@ CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_US122L=m
 CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
 
 #
 # PCMCIA devices
@@ -3188,6 +3197,7 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_EHCI_MV is not set
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
 CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PCI=y
 # CONFIG_USB_OHCI_HCD_SSB is not set
 # CONFIG_USB_OHCI_HCD_PLATFORM is not set
 CONFIG_USB_UHCI_HCD=y
@@ -3198,6 +3208,7 @@ CONFIG_USB_SL811_HCD_ISO=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_FUSBH200_HCD=m
 
 #
 # USB Device Class drivers
@@ -3228,7 +3239,7 @@ CONFIG_USB_STORAGE_REALTEK=m
 CONFIG_REALTEK_AUTOPM=y
 CONFIG_USB_STORAGE_ENE_UB6250=m
 # CONFIG_USB_LIBUSUAL is not set
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
 
 
 #
@@ -3292,6 +3303,7 @@ CONFIG_HID_ZYDACRON=m
 # CONFIG_HID_SENSOR_HUB is not set
 CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
 CONFIG_HID_UCLOGIC=m
 CONFIG_HID_WALTOP=m
 CONFIG_HID_ROCCAT_PYRA=m
@@ -3306,6 +3318,7 @@ CONFIG_HID_ROCCAT_ISKU=m
 CONFIG_HID_ROCCAT_KOVAPLUS=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
+CONFIG_HID_HUION=m
 CONFIG_HID_SPEEDLINK=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_WIIMOTE_EXT=y
@@ -3511,6 +3524,7 @@ CONFIG_USB_SERIAL_XSENS_MT=m
 CONFIG_USB_SERIAL_DEBUG=m
 CONFIG_USB_SERIAL_SSU100=m
 CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_FLASHLOADER=m
 
 CONFIG_USB_SERIAL_CONSOLE=y
 
@@ -3798,7 +3812,7 @@ CONFIG_NFS_V2=y
 CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
-# CONFIG_NFS_SWAP is not set
+CONFIG_NFS_SWAP=y
 CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 CONFIG_NFSD=m
@@ -4242,7 +4256,7 @@ CONFIG_IBMASR=m
 CONFIG_PM_DEBUG=y
 CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
-# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_TEST_SUSPEND=y
 CONFIG_PM_RUNTIME=y
 # CONFIG_PM_OPP is not set
 # CONFIG_PM_AUTOSLEEP is not set
@@ -4350,7 +4364,9 @@ CONFIG_LEDS_WM831X_STATUS=m
 
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
+CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC_PCI=m
 # CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
 # CONFIG_TIMB_DMA is not set
 # CONFIG_DMATEST is not set
@@ -4580,6 +4596,7 @@ CONFIG_R8712U=m # Larry Finger maintains this (rhbz 699618)
 # CONFIG_ATH6K_LEGACY is not set
 # CONFIG_USB_ENESTORAGE is not set
 # CONFIG_BCM_WIMAX is not set
+# CONFIG_USB_BTMTK is not set
 # CONFIG_FT1000 is not set
 # CONFIG_SPEAKUP is not set
 # CONFIG_DX_SEP is not set
@@ -4768,6 +4785,12 @@ CONFIG_IOMMU_SUPPORT=y
 
 # CONFIG_RESET_CONTROLLER is not set
 
+CONFIG_FMC=m
+CONFIG_FMC_FAKEDEV=m
+CONFIG_FMC_TRIVIAL=m
+CONFIG_FMC_WRITE_EEPROM=m
+CONFIG_FMC_CHARDEV=m
+
 # CONFIG_HSI is not set
 
 # CONFIG_PM_DEVFREQ is not set
diff --git a/config-nodebug b/config-nodebug
index 80c8a5f02..e61216b2f 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -2,99 +2,100 @@ CONFIG_SND_VERBOSE_PRINTK=y
 CONFIG_SND_DEBUG=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
 
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_PROVE_RCU is not set
+CONFIG_DEBUG_ATOMIC_SLEEP=y
+
+CONFIG_DEBUG_MUTEXES=y
+CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y
+CONFIG_DEBUG_RT_MUTEXES=y
+CONFIG_DEBUG_LOCK_ALLOC=y
+CONFIG_PROVE_LOCKING=y
+CONFIG_DEBUG_SPINLOCK=y
+CONFIG_PROVE_RCU=y
 # CONFIG_PROVE_RCU_REPEATEDLY is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_DEBUG_PER_CPU_MAPS=y
 CONFIG_CPUMASK_OFFSTACK=y
 
-# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
+CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
 
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_FAILSLAB is not set
-# CONFIG_FAIL_PAGE_ALLOC is not set
-# CONFIG_FAIL_MAKE_REQUEST is not set
-# CONFIG_FAULT_INJECTION_DEBUG_FS is not set
-# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set
-# CONFIG_FAIL_IO_TIMEOUT is not set
-# CONFIG_FAIL_MMC_REQUEST is not set
+CONFIG_FAULT_INJECTION=y
+CONFIG_FAILSLAB=y
+CONFIG_FAIL_PAGE_ALLOC=y
+CONFIG_FAIL_MAKE_REQUEST=y
+CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+CONFIG_FAIL_IO_TIMEOUT=y
+CONFIG_FAIL_MMC_REQUEST=y
 
-# CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_DEBUG_ON=y
 
-# CONFIG_LOCK_STAT is not set
+CONFIG_LOCK_STAT=y
 
-# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_DEBUG_STACK_USAGE=y
 
-# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DEBUG=y
 # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
 
-# CONFIG_DEBUG_SG is not set
+CONFIG_DEBUG_SG=y
 
 # CONFIG_DEBUG_PAGEALLOC is not set
 
-# CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DEBUG_OBJECTS is not set
+CONFIG_DEBUG_WRITECOUNT=y
+CONFIG_DEBUG_OBJECTS=y
 # CONFIG_DEBUG_OBJECTS_SELFTEST is not set
-# CONFIG_DEBUG_OBJECTS_FREE is not set
-# CONFIG_DEBUG_OBJECTS_TIMERS is not set
-# CONFIG_DEBUG_OBJECTS_RCU_HEAD is not set
+CONFIG_DEBUG_OBJECTS_FREE=y
+CONFIG_DEBUG_OBJECTS_TIMERS=y
+CONFIG_DEBUG_OBJECTS_RCU_HEAD=y
 CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 
-# CONFIG_X86_PTDUMP is not set
+CONFIG_X86_PTDUMP=y
 
-# CONFIG_CAN_DEBUG_DEVICES is not set
+CONFIG_CAN_DEBUG_DEVICES=y
 
-# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODULE_FORCE_UNLOAD=y
 
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+CONFIG_SYSCTL_SYSCALL_CHECK=y
 
-# CONFIG_DEBUG_NOTIFIERS is not set
+CONFIG_DEBUG_NOTIFIERS=y
 
-# CONFIG_DMA_API_DEBUG is not set
+CONFIG_DMA_API_DEBUG=y
 
-# CONFIG_MMIOTRACE is not set
+CONFIG_MMIOTRACE=y
 
-# CONFIG_DEBUG_CREDENTIALS is not set
+CONFIG_DEBUG_CREDENTIALS=y
 
 # off in both production debug and nodebug builds,
 #  on in rawhide nodebug builds
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
 
-# CONFIG_EXT4_DEBUG is not set
+CONFIG_EXT4_DEBUG=y
 
 # CONFIG_XFS_WARN is not set
 
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_DEBUG_PERF_USE_VMALLOC=y
 
-# CONFIG_JBD2_DEBUG is not set
+CONFIG_JBD2_DEBUG=y
 
-# CONFIG_NFSD_FAULT_INJECTION is not set
+CONFIG_NFSD_FAULT_INJECTION=y
 
-# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_DEBUG_BLK_CGROUP=y
 
-# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_DRBD_FAULT_INJECTION=y
 
-# CONFIG_ATH_DEBUG is not set
-# CONFIG_CARL9170_DEBUGFS is not set
-# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+CONFIG_ATH_DEBUG=y
+CONFIG_CARL9170_DEBUGFS=y
+CONFIG_IWLWIFI_DEVICE_TRACING=y
 
 # CONFIG_RTLWIFI_DEBUG is not set
 
-# CONFIG_DEBUG_OBJECTS_WORK is not set
+CONFIG_DEBUG_OBJECTS_WORK=y
 
-# CONFIG_DMADEVICES_DEBUG is not set
-# CONFIG_DMADEVICES_VDEBUG is not set
+CONFIG_DMADEVICES_DEBUG=y
+CONFIG_DMADEVICES_VDEBUG=y
 
 CONFIG_PM_ADVANCED_DEBUG=y
 
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-# CONFIG_QUOTA_DEBUG is not set
+CONFIG_CEPH_LIB_PRETTYDEBUG=y
+CONFIG_QUOTA_DEBUG=y
 
 CONFIG_PCI_DEFAULT_USE_CRS=y
 
@@ -102,17 +103,17 @@ CONFIG_KGDB_KDB=y
 CONFIG_KDB_KEYBOARD=y
 CONFIG_KDB_CONTINUE_CATASTROPHIC=0
 
-# CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set
-# CONFIG_TEST_LIST_SORT is not set
+CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
+CONFIG_TEST_LIST_SORT=y
 # CONFIG_TEST_STRING_HELPERS is not set
 
-# CONFIG_DETECT_HUNG_TASK is not set
+CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 
-# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 
-# CONFIG_DEBUG_KMEMLEAK is not set
+CONFIG_DEBUG_KMEMLEAK=y
 CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=1024
 # CONFIG_DEBUG_KMEMLEAK_TEST is not set
 CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
@@ -122,3 +123,5 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 # CONFIG_EDAC_DEBUG is not set
 
 # CONFIG_SPI_DEBUG is not set
+
+CONFIG_X86_DEBUG_STATIC_CPU_HAS=y
diff --git a/config-powerpc-generic b/config-powerpc-generic
index 2dcab485d..04af6af22 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -14,7 +14,7 @@ CONFIG_TAU_AVERAGE=y
 CONFIG_SECCOMP=y
 
 CONFIG_PM=y
-
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_PM_STD_PARTITION=""
 
 CONFIG_SUSPEND=y
@@ -374,6 +374,8 @@ CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 
 # CONFIG_FAIL_IOMMU is not set
+# CONFIG_SPAPR_TCE_IOMMU is not set
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
 
 # CONFIG_PPC_DENORMALISATION is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
diff --git a/config-s390x b/config-s390x
index 99c16ef96..9460b7154 100644
--- a/config-s390x
+++ b/config-s390x
@@ -218,6 +218,7 @@ CONFIG_SECCOMP=y
 CONFIG_PM=y
 CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION="/dev/jokes"
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 
 CONFIG_PERF_COUNTERS=y
 CONFIG_PERF_EVENTS=y
diff --git a/config-x86-generic b/config-x86-generic
index 42c0d09fe..be81bd74c 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -132,6 +132,7 @@ CONFIG_HOTPLUG_PCI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 
 CONFIG_PM=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
@@ -213,7 +214,6 @@ CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
 CONFIG_TOPSTAR_LAPTOP=m
 
-
 CONFIG_ACPI_WMI=m
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -331,7 +331,7 @@ CONFIG_STRICT_DEVMEM=y
 
 # CONFIG_MEMTEST is not set
 # CONFIG_DEBUG_TLBFLUSH is not set
-# CONFIG_MAXSMP is not set
+CONFIG_MAXSMP=y
 
 
 CONFIG_HP_ILO=m
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 5b6b32b47..85f588bc1 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -30,6 +30,7 @@ CONFIG_SWIOTLB=y
 # CONFIG_CALGARY_IOMMU is not set
 
 CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_MEM_SOFT_DIRTY=y
 
 CONFIG_KEXEC_JUMP=y
 
@@ -57,6 +58,7 @@ CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
 CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
 CONFIG_CRYPTO_CAST5_AVX_X86_64=m
 CONFIG_CRYPTO_CAST6_AVX_X86_64=m
+CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
 CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
 CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
 CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
diff --git a/kernel.spec b/kernel.spec
index 4964dc5d5..3d418a67b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -6,7 +6,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1. For rawhide
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
-%global released_kernel 1
+%global released_kernel 0
 
 # Sign modules on x86.  Make sure the config files match this setting if more
 # architectures are added.
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 2
+%global baserelease 1
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -95,7 +95,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 0
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -156,7 +156,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 %define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
@@ -169,7 +169,7 @@ Summary: The Linux kernel
 %define doc_build_fail true
 %endif
 
-%define rawhide_skip_docs 0
+%define rawhide_skip_docs 1
 %if 0%{?rawhide_skip_docs}
 %define with_doc 0
 %define doc_build_fail true
@@ -716,8 +716,6 @@ Patch15000: nowatchdog-on-virt.patch
 
 # ARM64
 
-Patch16000: arm64-makefile-vdso_install.patch
-
 # ARM
 
 # lpae
@@ -733,7 +731,7 @@ Patch21004: arm-omap-load-tfp410.patch
 Patch21005: arm-tegra-usb-no-reset-linux33.patch
 
 # ARM wandboard
-Patch21006: arm-wandboard-quad.patch
+# Patch21006: arm-wandboard-quad.patch
 
 #rhbz 754518
 Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@@ -767,20 +765,8 @@ Patch25032: cve-2013-2147-ciss-info-leak.patch
 #CVE-2013-2148 rhbz 971258 971261
 Patch25033: fanotify-info-leak-in-copy_event_to_user.patch
 
-#CVE-2013-2851 rhbz 969515 971662
-Patch25035: block-do-not-pass-disk-names-as-format-strings.patch
-
-#CVE-2013-2164 rhbz 973100 973109
-Patch25038: cdrom-use-kzalloc-for-failing-hardware.patch
-
-#rhbz 969644
-Patch25046: KVM-x86-handle-idiv-overflow-at-kvm_write_tsc.patch
-
 Patch25047: drm-radeon-Disable-writeback-by-default-on-ppc.patch
 
-#rhbz 903741
-Patch25052: HID-input-return-ENODATA-if-reading-battery-attrs-fails.patch
-
 #rhbz 880035
 Patch25053: bridge-only-expire-the-mdb-entry-when-query-is-received.patch
 Patch25054: bridge-send-query-as-soon-as-leave-is-received.patch
@@ -1344,7 +1330,6 @@ ApplyPatch debug-bad-pte-modules.patch
 # x86(-64)
 
 # ARM64
-ApplyPatch arm64-makefile-vdso_install.patch
 
 #
 # ARM
@@ -1354,7 +1339,7 @@ ApplyPatch drm-exynos-fix-multiple-definition-build-error.patch
 ApplyPatch arm-omap-load-tfp410.patch
 ApplyPatch v2-thermal-cpu_cooling-fix-stub-function.patch
 ApplyPatch arm-tegra-usb-no-reset-linux33.patch
-ApplyPatch arm-wandboard-quad.patch
+#ApplyPatch arm-wandboard-quad.patch
 #
 # bugfixes to drivers and filesystems
 #
@@ -1489,20 +1474,8 @@ ApplyPatch cve-2013-2147-ciss-info-leak.patch
 #CVE-2013-2148 rhbz 971258 971261
 ApplyPatch fanotify-info-leak-in-copy_event_to_user.patch
 
-#CVE-2013-2851 rhbz 969515 971662
-ApplyPatch block-do-not-pass-disk-names-as-format-strings.patch
-
-#CVE-2013-2164 rhbz 973100 973109
-ApplyPatch cdrom-use-kzalloc-for-failing-hardware.patch
-
-#rhbz 969644
-ApplyPatch KVM-x86-handle-idiv-overflow-at-kvm_write_tsc.patch
-
 ApplyPatch drm-radeon-Disable-writeback-by-default-on-ppc.patch
 
-#rhbz 903741
-ApplyPatch HID-input-return-ENODATA-if-reading-battery-attrs-fails.patch
-
 #rhbz 880035
 ApplyPatch bridge-only-expire-the-mdb-entry-when-query-is-received.patch
 ApplyPatch bridge-send-query-as-soon-as-leave-is-received.patch
@@ -2314,6 +2287,10 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Jul 08 2013 Justin M. Forbes <jforbes@redhat.com> - 3.11.0-0.rc0.git2.1
+- Linux v3.10-6005-gd2b4a64
+- Reenable debugging options.
+
 * Fri Jul 05 2013 Josh Boyer <jwboyer@redhat.com>
 - Add vhost-net use-after-free fix (rhbz 976789 980643)
 - Add fix for timer issue in bridge code (rhbz 980254)
diff --git a/sources b/sources
index 21f495ebc..8844f4bee 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 4f25cd5bec5f8d5a7d935b3f2ccb8481  linux-3.10.tar.xz
+be862c063de23555e7f6d0b3c9b9544f  patch-3.10-git2.xz