Linux 3.6.3

kernel.spec

@@ -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 3
+%global baserelease 1
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -74,7 +74,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 2
+%define stable_update 3
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -758,9 +758,6 @@ Patch22000: weird-root-dentry-name-debug.patch
 #selinux ptrace child permissions
 Patch22001: selinux-apply-different-permission-to-ptrace-child.patch
 
-#rhbz 847548
-Patch22066: virtio-scsi-Initialize-scatterlist-structure.patch
-
 #rhbz 846037
 Patch22067: selinux-Fix-sel_netnode_insert-suspicious-rcu-dereference.patch
 
@@ -1481,9 +1478,6 @@ ApplyPatch weird-root-dentry-name-debug.patch
 #selinux ptrace child permissions
 ApplyPatch selinux-apply-different-permission-to-ptrace-child.patch
 
-#rhbz 847548
-ApplyPatch virtio-scsi-Initialize-scatterlist-structure.patch
-
 #rhbz 846037
 ApplyPatch selinux-Fix-sel_netnode_insert-suspicious-rcu-dereference.patch
 
@@ -2348,6 +2342,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Oct 22 2012 Justin M. Forbes <jforbes@linuxtx.org> - 3.6.3-1
+- Linux 3.6.3
+
 * Mon Oct 22 2012 Peter Robinson <pbrobinson@fedoraproject.org>
 - Revert ARM misaligned access check to stop kernel OOPS
 - Actually apply highbank sata patch

sources

@@ -1,2 +1,2 @@
 1a1760420eac802c541a20ab51a093d1  linux-3.6.tar.xz
-ad1020c82a71ee1ef2416a0d12e724df  patch-3.6.2.xz
+96701113d37ef4f9b785206ab8bcc71e  patch-3.6.3.xz

virtio-scsi-Initialize-scatterlist-structure.patch

@@ -1,28 +0,0 @@
-From: "Richard W.M. Jones" <rjones@redhat.com>
-
-The sg struct is used without being initialized.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=847548
-
-Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
----
- drivers/scsi/virtio_scsi.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
-index c7030fb..8a66f83 100644
---- a/drivers/scsi/virtio_scsi.c
-+++ b/drivers/scsi/virtio_scsi.c
-@@ -219,7 +219,7 @@ static int virtscsi_kick_event(struct virtio_scsi *vscsi,
- 	struct scatterlist sg;
- 	unsigned long flags;
- 
--	sg_set_buf(&sg, &event_node->event, sizeof(struct virtio_scsi_event));
-+	sg_init_one(&sg, &event_node->event, sizeof(struct virtio_scsi_event));
- 
- 	spin_lock_irqsave(&vscsi->event_vq.vq_lock, flags);
- 
--- 
-1.7.10.4
-
-