[kernel/f18] Linux 3.6.10

[Justin M. Forbes]

commit 6cd918b5725f66525f6f06d7bd9098c65c27faf6
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Tue Dec 11 07:56:36 2012 -0600

    Linux 3.6.10

 ...set-ring-address-before-enabling-receiver.patch |   64 ++++
 kernel.spec                                        |   15 +-
 radeon-evergreen-3.6.9-fixes.mbox                  |  376 --------------------
 sources                                            |    2 +-
 4 files changed, 72 insertions(+), 385 deletions(-)
---
diff --git a/8139cp-revert-set-ring-address-before-enabling-receiver.patch b/8139cp-revert-set-ring-address-before-enabling-receiver.patch
new file mode 100644
index 0000000..07ae2c2
--- /dev/null
+++ b/8139cp-revert-set-ring-address-before-enabling-receiver.patch
@@ -0,0 +1,64 @@
+From b26623dab7eeb1e9f5898c7a49458789dd492f20 Mon Sep 17 00:00:00 2001
+From: Francois Romieu <romieu at fr.zoreil.com>
+Date: Wed, 21 Nov 2012 10:07:29 +0000
+Subject: 8139cp: revert "set ring address before enabling receiver"
+
+From: Francois Romieu <romieu at fr.zoreil.com>
+
+commit b26623dab7eeb1e9f5898c7a49458789dd492f20 upstream.
+
+This patch reverts b01af4579ec41f48e9b9c774e70bd6474ad210db.
+
+The original patch was tested with emulated hardware. Real
+hardware chokes.
+
+Fixes https://bugzilla.kernel.org/show_bug.cgi?id=47041
+
+Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>
+Acked-by: Jeff Garzik <jgarzik at redhat.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+Signed-off-by: CAI Qian <caiqian at redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
+
+---
+ drivers/net/ethernet/realtek/8139cp.c |   22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+--- a/drivers/net/ethernet/realtek/8139cp.c
++++ b/drivers/net/ethernet/realtek/8139cp.c
+@@ -979,17 +979,6 @@ static void cp_init_hw (struct cp_privat
+ 	cpw32_f (MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0)));
+ 	cpw32_f (MAC0 + 4, le32_to_cpu (*(__le32 *) (dev->dev_addr + 4)));
+ 
+-	cpw32_f(HiTxRingAddr, 0);
+-	cpw32_f(HiTxRingAddr + 4, 0);
+-
+-	ring_dma = cp->ring_dma;
+-	cpw32_f(RxRingAddr, ring_dma & 0xffffffff);
+-	cpw32_f(RxRingAddr + 4, (ring_dma >> 16) >> 16);
+-
+-	ring_dma += sizeof(struct cp_desc) * CP_RX_RING_SIZE;
+-	cpw32_f(TxRingAddr, ring_dma & 0xffffffff);
+-	cpw32_f(TxRingAddr + 4, (ring_dma >> 16) >> 16);
+-
+ 	cp_start_hw(cp);
+ 	cpw8(TxThresh, 0x06); /* XXX convert magic num to a constant */
+ 
+@@ -1003,6 +992,17 @@ static void cp_init_hw (struct cp_privat
+ 
+ 	cpw8(Config5, cpr8(Config5) & PMEStatus);
+ 
++	cpw32_f(HiTxRingAddr, 0);
++	cpw32_f(HiTxRingAddr + 4, 0);
++
++	ring_dma = cp->ring_dma;
++	cpw32_f(RxRingAddr, ring_dma & 0xffffffff);
++	cpw32_f(RxRingAddr + 4, (ring_dma >> 16) >> 16);
++
++	ring_dma += sizeof(struct cp_desc) * CP_RX_RING_SIZE;
++	cpw32_f(TxRingAddr, ring_dma & 0xffffffff);
++	cpw32_f(TxRingAddr + 4, (ring_dma >> 16) >> 16);
++
+ 	cpw16(MultiIntr, 0);
+ 
+ 	cpw8_f(Cfg9346, Cfg9346_Lock);
diff --git a/kernel.spec b/kernel.spec
index 4d23e10..bc971f8 100644
--- a/kernel.spec
+++ b/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 4
+%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 9
+%define stable_update 10
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -809,12 +809,10 @@ Patch21229: exec-use-eloop-for-max-recursion-depth.patch
 Patch21230: SCSI-mvsas-Fix-oops-when-ata-commond-timeout.patch
 
 #rhbz 851278
+Patch21231: 8139cp-revert-set-ring-address-before-enabling-receiver.patch
 Patch21232: 8139cp-set-ring-address-after-enabling-C-mode.patch
 Patch21233: 8139cp-re-enable-interrupts-after-tx-timeout.patch
 
-#rhbz 855275
-Patch21236: radeon-evergreen-3.6.9-fixes.mbox
-
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1571,12 +1569,10 @@ ApplyPatch exec-use-eloop-for-max-recursion-depth.patch
 ApplyPatch SCSI-mvsas-Fix-oops-when-ata-commond-timeout.patch
 
 #rhbz 851278
+ApplyPatch 8139cp-revert-set-ring-address-before-enabling-receiver.patch -R
 ApplyPatch 8139cp-set-ring-address-after-enabling-C-mode.patch
 ApplyPatch 8139cp-re-enable-interrupts-after-tx-timeout.patch
 
-#rhbz 855275
-ApplyPatch radeon-evergreen-3.6.9-fixes.mbox
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2442,6 +2438,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Dec 11 2012 Justin M. Forbes <jforbes at redhat.com> 3.6.10-1
+- Linux 3.6.10
+
 * Wed Dec 05 2012 Dave Jones <davej at redhat.com>
 - Team driver updates (Jiri Pirko)
 
diff --git a/sources b/sources
index 7369b36..eebf282 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 1a1760420eac802c541a20ab51a093d1  linux-3.6.tar.xz
-a7c656034599f90dcbc50895b69022aa  patch-3.6.9.xz
+406a52f90a2ddc78a3ecdf4fe46e7cf7  patch-3.6.10.xz