Linux v4.0-7209-g7d69cff26cea

2015-04-17 08:33:28 -04:00 · 2015-04-17 08:33:28 -04:00 · 9b68c8a1f7
commit 9b68c8a1f7
parent d72c260b23
4 changed files with 8 additions and 5 deletions
--- a/1
+++ b/1
@ -576,6 +576,7 @@ CONFIG_TI_EDMA=y

 # Mailbox
 CONFIG_MAILBOX=y
+# CONFIG_ARM_MHU is not set

 # MTD
 # CONFIG_MG_DISK is not set
--- a/kernel.spec
+++ b/kernel.spec
@ -67,7 +67,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 4.%{upstream_sublevel}.0
 %endif
@ -2187,6 +2187,9 @@ fi
 #
 # 
 %changelog
+* Fri Apr 17 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git6.1
+- Linux v4.0-7209-g7d69cff26cea
+
 * Thu Apr 16 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git5.1
 - Linux v4.0-7084-g497a5df7bf6f

--- a/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
+++ b/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@ -9,10 +9,10 @@ Upstream-status: Fedora mustard (might be worth dropping...)
 1 file changed, 6 insertions(+), 1 deletion(-)

 diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
-index 6b78476d04bb..d490145a317d 100644
+index dcc42446f58a..3a075eef713d 100644
 --- a/drivers/scsi/sd.c
 +++ b/drivers/scsi/sd.c
-@@ -2750,13 +2750,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp)
+@@ -2726,13 +2726,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp)
 static int sd_revalidate_disk(struct gendisk *disk)
 {
 	struct scsi_disk *sdkp = scsi_disk(disk);
--- a/3
+++ b/3
@ -1,4 +1,3 @@
 a86916bd12798220da9eb4a1eec3616d  linux-4.0.tar.xz
 d125eecce68ab6fb5f1f23523c2c04b8  perf-man-4.0.tar.gz
-386fb222abea7dbffaa8560a756336cf  patch-4.0-git4.xz
-6d2862ae0c0cf36266efc6fcdae760f9  patch-4.0-git5.xz
+ef582cbcc3652cd2aeaaf0ca05b5bed4  patch-4.0-git6.xz