[kernel] Linux v3.9-4516-gc9ef713

[Josh Boyer]

commit 2f0dc63fe0e69aa6b9496d5dccd157f99a985db7
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Tue Apr 30 14:08:17 2013 -0400

    Linux v3.9-4516-gc9ef713

 config-generic              |    2 ++
 debug-bad-pte-modules.patch |   25 +++++++++++++++++--------
 kernel.spec                 |    5 ++++-
 sources                     |    2 +-
 4 files changed, 24 insertions(+), 10 deletions(-)
---
diff --git a/config-generic b/config-generic
index 3e96d36..b46401e 100644
--- a/config-generic
+++ b/config-generic
@@ -2748,6 +2748,7 @@ CONFIG_DVB_BUDGET_CORE=m
 CONFIG_DVB_PLUTO2=m
 CONFIG_SMS_SIANO_MDTV=m
 CONFIG_SMS_SIANO_RC=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
 CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_SMS_USB_DRV=m
 CONFIG_SMS_SDIO_DRV=m
@@ -3288,6 +3289,7 @@ CONFIG_HID_SAITEK=m
 CONFIG_HID_TIVO=m
 CONFIG_HID_GENERIC=y
 CONFIG_HID_AUREAL=m
+CONFIG_HID_APPLEIR=m
 
 
 #
diff --git a/debug-bad-pte-modules.patch b/debug-bad-pte-modules.patch
index 0472310..8dbf6db 100644
--- a/debug-bad-pte-modules.patch
+++ b/debug-bad-pte-modules.patch
@@ -1,11 +1,18 @@
-When we encounter a bad PTE, print out what modules were loaded,
-so we can see if there is a common driver potentially at fault.
+From 3cd4fefa1d614debf75f059def34ac1aaaf96501 Mon Sep 17 00:00:00 2001
+From: Josh Boyer <jwboyer at redhat.com>
+Date: Tue, 30 Apr 2013 14:01:57 -0400
+Subject: [PATCH] When we encounter a bad PTE, print out what modules were
+ loaded, so we can see if there is a common driver potentially at fault.
 
 Signed-off-by: Dave Jones <davej at redhat.com>
+---
+ mm/memory.c | 2 ++
+ 1 file changed, 2 insertions(+)
 
-diff -durpN '--exclude-from=/home/davej/.exclude' /home/davej/src/kernel/git-trees/linux/mm/memory.c linux-dj/mm/memory.c
---- /home/davej/src/kernel/git-trees/linux/mm/memory.c	2013-02-26 14:41:18.591116577 -0500
-+++ linux-dj/mm/memory.c	2013-02-28 20:04:37.678304092 -0500
+diff --git a/mm/memory.c b/mm/memory.c
+index 6dc1882..99564df 100644
+--- a/mm/memory.c
++++ b/mm/memory.c
 @@ -57,6 +57,7 @@
  #include <linux/swapops.h>
  #include <linux/elf.h>
@@ -14,12 +21,14 @@ diff -durpN '--exclude-from=/home/davej/.exclude' /home/davej/src/kernel/git-tre
  #include <linux/migrate.h>
  #include <linux/string.h>
  
-@@ -719,6 +722,7 @@ static void print_bad_pte(struct vm_area
+@@ -720,6 +721,7 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
  	if (vma->vm_file && vma->vm_file->f_op)
- 		print_symbol(KERN_ALERT "vma->vm_file->f_op->mmap: %s\n",
- 				(unsigned long)vma->vm_file->f_op->mmap);
+ 		printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n",
+ 		       vma->vm_file->f_op->mmap);
 +	print_modules();
  	dump_stack();
  	add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
  }
+-- 
+1.8.1.4
 
diff --git a/kernel.spec b/kernel.spec
index 5bca1df..ac9681b 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 5
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -2290,6 +2290,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Apr 30 2013 Josh Boyer <jwboyer at redhat.com> - 3.10.0-0.rc0.git6.1
+- Linux v3.9-4516-gc9ef713
+
 * Tue Apr 30 2013 Josh Boyer <jwboyer at redhat.com> - 3.10.0-0.rc0.git5.1
 - Linux v3.9-3520-g5a5a1bf
 
diff --git a/sources b/sources
index 7fa5b97..5e576c8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 4348c9b6b2eb3144d601e87c19d5d909  linux-3.9.tar.xz
-5e4a52d1e51f5dc0f218d82f0a08269c  patch-3.9-git5.xz
+2c14066053833a16f1fe9dccddf0dfb6  patch-3.9-git6.xz