Linux v3.13-rc4

- Disable debugging options.

7 files changed, 72 insertions, 307 deletions

diff --git a/0001-Revert-selinux-consider-filesystem-subtype-in-polici.patch b/0001-Revert-selinux-consider-filesystem-subtype-in-polici.patch
deleted file mode 100644
index 155bddc18..000000000
--- a/0001-Revert-selinux-consider-filesystem-subtype-in-polici.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-Bugzilla: 1033965
-Upstream-status: 3.13 possible, or alternate fix
-
-From df777e7aa8e3dd330bde63238595266ce1ee2d42 Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer@fedoraproject.org>
-Date: Tue, 10 Dec 2013 15:06:49 -0500
-Subject: [PATCH] Revert "selinux: consider filesystem subtype in policies"
-
-This reverts commit 102aefdda4d8275ce7d7100bc16c88c74272b260.
----
- security/selinux/hooks.c       | 40 ++++++++++++++++++----------------------
- security/selinux/ss/services.c | 42 ++++--------------------------------------
- 2 files changed, 22 insertions(+), 60 deletions(-)
-
-diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
-index 794c3ca..98b1caa 100644
---- a/security/selinux/hooks.c
-+++ b/security/selinux/hooks.c
-@@ -95,10 +95,6 @@
- #include "audit.h"
- #include "avc_ss.h"
- 
--#define SB_TYPE_FMT "%s%s%s"
--#define SB_SUBTYPE(sb) (sb->s_subtype && sb->s_subtype[0])
--#define SB_TYPE_ARGS(sb) sb->s_type->name, SB_SUBTYPE(sb) ? "." : "", SB_SUBTYPE(sb) ? sb->s_subtype : ""
--
- extern struct security_operations *security_ops;
- 
- /* SECMARK reference count */
-@@ -413,8 +409,8 @@ static int sb_finish_set_opts(struct super_block *sb)
- 		   the first boot of the SELinux kernel before we have
- 		   assigned xattr values to the filesystem. */
- 		if (!root_inode->i_op->getxattr) {
--			printk(KERN_WARNING "SELinux: (dev %s, type "SB_TYPE_FMT") has no "
--			       "xattr support\n", sb->s_id, SB_TYPE_ARGS(sb));
-+			printk(KERN_WARNING "SELinux: (dev %s, type %s) has no "
-+			       "xattr support\n", sb->s_id, sb->s_type->name);
- 			rc = -EOPNOTSUPP;
- 			goto out;
- 		}
-@@ -422,22 +418,22 @@ static int sb_finish_set_opts(struct super_block *sb)
- 		if (rc < 0 && rc != -ENODATA) {
- 			if (rc == -EOPNOTSUPP)
- 				printk(KERN_WARNING "SELinux: (dev %s, type "
--				       SB_TYPE_FMT") has no security xattr handler\n",
--				       sb->s_id, SB_TYPE_ARGS(sb));
-+				       "%s) has no security xattr handler\n",
-+				       sb->s_id, sb->s_type->name);
- 			else
- 				printk(KERN_WARNING "SELinux: (dev %s, type "
--				       SB_TYPE_FMT") getxattr errno %d\n", sb->s_id,
--				       SB_TYPE_ARGS(sb), -rc);
-+				       "%s) getxattr errno %d\n", sb->s_id,
-+				       sb->s_type->name, -rc);
- 			goto out;
- 		}
- 	}
- 
- 	if (sbsec->behavior > ARRAY_SIZE(labeling_behaviors))
--		printk(KERN_ERR "SELinux: initialized (dev %s, type "SB_TYPE_FMT"), unknown behavior\n",
--		       sb->s_id, SB_TYPE_ARGS(sb));
-+		printk(KERN_ERR "SELinux: initialized (dev %s, type %s), unknown behavior\n",
-+		       sb->s_id, sb->s_type->name);
- 	else
--		printk(KERN_DEBUG "SELinux: initialized (dev %s, type "SB_TYPE_FMT"), %s\n",
--		       sb->s_id, SB_TYPE_ARGS(sb),
-+		printk(KERN_DEBUG "SELinux: initialized (dev %s, type %s), %s\n",
-+		       sb->s_id, sb->s_type->name,
- 		       labeling_behaviors[sbsec->behavior-1]);
- 
- 	sbsec->flags |= SE_SBINITIALIZED;
-@@ -600,6 +596,7 @@ static int selinux_set_mnt_opts(struct super_block *sb,
- 	const struct cred *cred = current_cred();
- 	int rc = 0, i;
- 	struct superblock_security_struct *sbsec = sb->s_security;
-+	const char *name = sb->s_type->name;
- 	struct inode *inode = sbsec->sb->s_root->d_inode;
- 	struct inode_security_struct *root_isec = inode->i_security;
- 	u32 fscontext_sid = 0, context_sid = 0, rootcontext_sid = 0;
-@@ -658,8 +655,8 @@ static int selinux_set_mnt_opts(struct super_block *sb,
- 					     strlen(mount_options[i]), &sid);
- 		if (rc) {
- 			printk(KERN_WARNING "SELinux: security_context_to_sid"
--			       "(%s) failed for (dev %s, type "SB_TYPE_FMT") errno=%d\n",
--			       mount_options[i], sb->s_id, SB_TYPE_ARGS(sb), rc);
-+			       "(%s) failed for (dev %s, type %s) errno=%d\n",
-+			       mount_options[i], sb->s_id, name, rc);
- 			goto out;
- 		}
- 		switch (flags[i]) {
-@@ -806,8 +803,7 @@ out:
- out_double_mount:
- 	rc = -EINVAL;
- 	printk(KERN_WARNING "SELinux: mount invalid.  Same superblock, different "
--	       "security settings for (dev %s, type "SB_TYPE_FMT")\n", sb->s_id,
--	       SB_TYPE_ARGS(sb));
-+	       "security settings for (dev %s, type %s)\n", sb->s_id, name);
- 	goto out;
- }
- 
-@@ -2480,8 +2476,8 @@ static int selinux_sb_remount(struct super_block *sb, void *data)
- 		rc = security_context_to_sid(mount_options[i], len, &sid);
- 		if (rc) {
- 			printk(KERN_WARNING "SELinux: security_context_to_sid"
--			       "(%s) failed for (dev %s, type "SB_TYPE_FMT") errno=%d\n",
--			       mount_options[i], sb->s_id, SB_TYPE_ARGS(sb), rc);
-+			       "(%s) failed for (dev %s, type %s) errno=%d\n",
-+			       mount_options[i], sb->s_id, sb->s_type->name, rc);
- 			goto out_free_opts;
- 		}
- 		rc = -EINVAL;
-@@ -2519,8 +2515,8 @@ out_free_secdata:
- 	return rc;
- out_bad_option:
- 	printk(KERN_WARNING "SELinux: unable to change security options "
--	       "during remount (dev %s, type "SB_TYPE_FMT")\n", sb->s_id,
--	       SB_TYPE_ARGS(sb));
-+	       "during remount (dev %s, type=%s)\n", sb->s_id,
-+	       sb->s_type->name);
- 	goto out_free_opts;
- }
- 
-diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
-index ee470a0..d106733 100644
---- a/security/selinux/ss/services.c
-+++ b/security/selinux/ss/services.c
-@@ -2334,50 +2334,16 @@ int security_fs_use(struct super_block *sb)
- 	struct ocontext *c;
- 	struct superblock_security_struct *sbsec = sb->s_security;
- 	const char *fstype = sb->s_type->name;
--	const char *subtype = (sb->s_subtype && sb->s_subtype[0]) ? sb->s_subtype : NULL;
--	struct ocontext *base = NULL;
- 
- 	read_lock(&policy_rwlock);
- 
--	for (c = policydb.ocontexts[OCON_FSUSE]; c; c = c->next) {
--		char *sub;
--		int baselen;
--
--		baselen = strlen(fstype);
--
--		/* if base does not match, this is not the one */
--		if (strncmp(fstype, c->u.name, baselen))
--			continue;
--
--		/* if there is no subtype, this is the one! */
--		if (!subtype)
--			break;
--
--		/* skip past the base in this entry */
--		sub = c->u.name + baselen;
--
--		/* entry is only a base. save it. keep looking for subtype */
--		if (sub[0] == '\0') {
--			base = c;
--			continue;
--		}
--
--		/* entry is not followed by a subtype, so it is not a match */
--		if (sub[0] != '.')
--			continue;
--
--		/* whew, we found a subtype of this fstype */
--		sub++; /* move past '.' */
--
--		/* exact match of fstype AND subtype */
--		if (!strcmp(subtype, sub))
-+	c = policydb.ocontexts[OCON_FSUSE];
-+	while (c) {
-+		if (strcmp(fstype, c->u.name) == 0)
- 			break;
-+		c = c->next;
- 	}
- 
--	/* in case we had found an fstype match but no subtype match */
--	if (!c)
--		c = base;
--
- 	if (c) {
- 		sbsec->behavior = c->v.behavior;
- 		if (!c->sid[0]) {
--- 
-1.8.3.1
-
diff --git a/0001-drm-radeon-dpm-Fix-hwmon-crash.patch b/0001-drm-radeon-dpm-Fix-hwmon-crash.patch
deleted file mode 100644
index 3efe9b2ae..000000000
--- a/0001-drm-radeon-dpm-Fix-hwmon-crash.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72457
-Upstream-status: should hit 3.13
-
-From 2cbe7f259737e994d5a63c06a104027214e27978 Mon Sep 17 00:00:00 2001
-From: Martin Andersson <g02maran@gmail.com>
-Date: Sat, 7 Dec 2013 23:22:10 +0100
-Subject: [PATCH] drm/radeon/dpm: Fix hwmon crash
-
-Commit ec39f64bba3421c2060fcbd1aeb6eec81fe0a42d (drm/radeon/dpm: Convert
-to use devm_hwmon_register_with_groups) converted one usage of
-dev_get_drvdata, but there were two more.
-
-Signed-off-by: Martin Andersson <g02maran@gmail.com>
----
- drivers/gpu/drm/radeon/radeon_pm.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
-index dc75bb6..984097b 100644
---- a/drivers/gpu/drm/radeon/radeon_pm.c
-+++ b/drivers/gpu/drm/radeon/radeon_pm.c
-@@ -552,8 +552,7 @@ static ssize_t radeon_hwmon_show_temp_thresh(struct device *dev,
- 					     struct device_attribute *attr,
- 					     char *buf)
- {
--	struct drm_device *ddev = dev_get_drvdata(dev);
--	struct radeon_device *rdev = ddev->dev_private;
-+	struct radeon_device *rdev = dev_get_drvdata(dev);
- 	int hyst = to_sensor_dev_attr(attr)->index;
- 	int temp;
- 
-@@ -580,8 +579,7 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj,
- 					struct attribute *attr, int index)
- {
- 	struct device *dev = container_of(kobj, struct device, kobj);
--	struct drm_device *ddev = dev_get_drvdata(dev);
--	struct radeon_device *rdev = ddev->dev_private;
-+	struct radeon_device *rdev = dev_get_drvdata(dev);
- 
- 	/* Skip limit attributes if DPM is not enabled */
- 	if (rdev->pm.pm_method != PM_METHOD_DPM &&
--- 
-1.8.4.2
-
diff --git a/config-generic b/config-generic
index e8d41b795..c510fddd3 100644
--- a/config-generic
+++ b/config-generic
@@ -1643,13 +1643,13 @@ CONFIG_B43_SDIO=y
 CONFIG_B43_BCMA=y
 # CONFIG_B43_BCMA_EXTRA is not set
 CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_DEBUG=y
+# CONFIG_B43_DEBUG is not set
 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=y
+# CONFIG_B43LEGACY_DEBUG is not set
 CONFIG_B43LEGACY_DMA=y
 CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
@@ -3460,7 +3460,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=m
+# CONFIG_USB_UAS is not set
 
 
 #
@@ -4519,7 +4519,7 @@ CONFIG_PM_DEBUG=y
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
-CONFIG_PM_TEST_SUSPEND=y
+# CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_PM_RUNTIME=y
 # CONFIG_PM_OPP is not set
 # CONFIG_PM_AUTOSLEEP is not set
diff --git a/config-nodebug b/config-nodebug
index be9e1aa85..f9f43091b 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -2,100 +2,100 @@ CONFIG_SND_VERBOSE_PRINTK=y
 CONFIG_SND_DEBUG=y
 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
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_PROVE_RCU=y
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH 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_PROVE_RCU_REPEATEDLY is not set
-CONFIG_DEBUG_PER_CPU_MAPS=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_CPUMASK_OFFSTACK=y
 
-CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
+# CONFIG_CPU_NOTIFIER_ERROR_INJECT 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_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_SLUB_DEBUG_ON=y
+# CONFIG_SLUB_DEBUG_ON is not set
 
-CONFIG_LOCK_STAT=y
+# CONFIG_LOCK_STAT is not set
 
-CONFIG_DEBUG_STACK_USAGE=y
+# CONFIG_DEBUG_STACK_USAGE is not set
 
-CONFIG_ACPI_DEBUG=y
+# CONFIG_ACPI_DEBUG is not set
 # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
 
-CONFIG_DEBUG_SG=y
+# CONFIG_DEBUG_SG is not set
 
 # CONFIG_DEBUG_PAGEALLOC is not set
 
-CONFIG_DEBUG_WRITECOUNT=y
-CONFIG_DEBUG_OBJECTS=y
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_OBJECTS_SELFTEST is not set
-CONFIG_DEBUG_OBJECTS_FREE=y
-CONFIG_DEBUG_OBJECTS_TIMERS=y
-CONFIG_DEBUG_OBJECTS_RCU_HEAD=y
+# 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_ENABLE_DEFAULT=1
 
-CONFIG_X86_PTDUMP=y
+# CONFIG_X86_PTDUMP is not set
 
-CONFIG_CAN_DEBUG_DEVICES=y
+# CONFIG_CAN_DEBUG_DEVICES is not set
 
-CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
 
-CONFIG_SYSCTL_SYSCALL_CHECK=y
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
 
-CONFIG_DEBUG_NOTIFIERS=y
+# CONFIG_DEBUG_NOTIFIERS is not set
 
-CONFIG_DMA_API_DEBUG=y
+# CONFIG_DMA_API_DEBUG is not set
 
-CONFIG_MMIOTRACE=y
+# CONFIG_MMIOTRACE is not set
 
-CONFIG_DEBUG_CREDENTIALS=y
+# CONFIG_DEBUG_CREDENTIALS is not set
 
 # off in both production debug and nodebug builds,
 #  on in rawhide nodebug builds
-CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 
-CONFIG_EXT4_DEBUG=y
+# CONFIG_EXT4_DEBUG is not set
 
 # CONFIG_XFS_WARN is not set
 
-CONFIG_DEBUG_PERF_USE_VMALLOC=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 
-CONFIG_JBD2_DEBUG=y
+# CONFIG_JBD2_DEBUG is not set
 
-CONFIG_NFSD_FAULT_INJECTION=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
 
-CONFIG_DEBUG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
 
-CONFIG_DRBD_FAULT_INJECTION=y
+# CONFIG_DRBD_FAULT_INJECTION is not set
 
-CONFIG_ATH_DEBUG=y
-CONFIG_CARL9170_DEBUGFS=y
-CONFIG_IWLWIFI_DEVICE_TRACING=y
+# CONFIG_ATH_DEBUG is not set
+# CONFIG_CARL9170_DEBUGFS is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
 
 # CONFIG_RTLWIFI_DEBUG is not set
 
-CONFIG_DEBUG_OBJECTS_WORK=y
+# CONFIG_DEBUG_OBJECTS_WORK is not set
 
-CONFIG_DMADEVICES_DEBUG=y
-CONFIG_DMADEVICES_VDEBUG=y
+# CONFIG_DMADEVICES_DEBUG is not set
+# CONFIG_DMADEVICES_VDEBUG is not set
 
 CONFIG_PM_ADVANCED_DEBUG=y
 
-CONFIG_CEPH_LIB_PRETTYDEBUG=y
-CONFIG_QUOTA_DEBUG=y
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+# CONFIG_QUOTA_DEBUG is not set
 
 CONFIG_PCI_DEFAULT_USE_CRS=y
 
@@ -103,18 +103,18 @@ CONFIG_KGDB_KDB=y
 CONFIG_KDB_KEYBOARD=y
 CONFIG_KDB_CONTINUE_CATASTROPHIC=0
 
-CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
+# CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set
 # CONFIG_PERCPU_TEST is not set
-CONFIG_TEST_LIST_SORT=y
+# CONFIG_TEST_LIST_SORT is not set
 # CONFIG_TEST_STRING_HELPERS is not set
 
-CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 
-CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
+# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
 
-CONFIG_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
 CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=1024
 # CONFIG_DEBUG_KMEMLEAK_TEST is not set
 CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
@@ -125,7 +125,7 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 
 # CONFIG_SPI_DEBUG is not set
 
-CONFIG_X86_DEBUG_STATIC_CPU_HAS=y
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
 
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_LATENCYTOP is not set
diff --git a/config-x86-generic b/config-x86-generic
index fa0cb8411..3d42bbcb2 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -328,7 +328,7 @@ CONFIG_SP5100_TCO=m
 
 # CONFIG_MEMTEST is not set
 # CONFIG_DEBUG_TLBFLUSH is not set
-CONFIG_MAXSMP=y
+# CONFIG_MAXSMP is not set
 
 
 CONFIG_HP_ILO=m
diff --git a/kernel.spec b/kernel.spec
index 70ffe5dc9..f68b99f15 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -93,9 +93,9 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 3
+%define rcrev 4
 # The git snapshot level
-%define gitrev 5
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -158,7 +158,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 0
+%define debugbuildsenabled 1
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 %define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
@@ -171,7 +171,7 @@ Summary: The Linux kernel
 %define doc_build_fail true
 %endif
 
-%define rawhide_skip_docs 1
+%define rawhide_skip_docs 0
 %if 0%{?rawhide_skip_docs}
 %define with_doc 0
 %define doc_build_fail true
@@ -708,11 +708,6 @@ Patch25128: dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch
 #rhbz 1000439
 Patch25129: cpupower-Fix-segfault-due-to-incorrect-getopt_long-a.patch
 
-#rhbz 1033965
-Patch25169: 0001-Revert-selinux-consider-filesystem-subtype-in-polici.patch
-
-Patch25170: 0001-drm-radeon-dpm-Fix-hwmon-crash.patch
-
 #rhbz 1030802
 Patch25171: elantech-Properly-differentiate-between-clickpads-an.patch
 
@@ -1387,11 +1382,6 @@ ApplyPatch dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch
 #rhbz 1000439
 ApplyPatch cpupower-Fix-segfault-due-to-incorrect-getopt_long-a.patch
 
-#rhbz 1033965
-ApplyPatch 0001-Revert-selinux-consider-filesystem-subtype-in-polici.patch
-
-ApplyPatch 0001-drm-radeon-dpm-Fix-hwmon-crash.patch
-
 #rhbz 1030802
 ApplyPatch elantech-Properly-differentiate-between-clickpads-an.patch
 
@@ -2209,6 +2199,10 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Mon Dec 16 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc4.git0.1
+- Linux v3.13-rc4
+- Disable debugging options.
+
 * Sat Dec 14 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc3.git5.1
 - Linux v3.13-rc3-362-gb2077eb
 
diff --git a/sources b/sources
index 0f3381298..0512b6239 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
 cc6ee608854e0da4b64f6c1ff8b6398c  linux-3.12.tar.xz
-be2604350d32ab4967f9773920de1ec8  patch-3.13-rc3.xz
-e17d693eeaf1b767371be9b30d5b3db9  patch-3.13-rc3-git5.xz
+d771c7ee9b9d08bb4cea091125589494  patch-3.13-rc4.xz
 a1a1e715cc0c95b4c90d432290b4ee96  perf-man.tar.gz