summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel.spec7
-rw-r--r--linux-2.6-ehci-check-port-status.patch2
-rw-r--r--sources1
3 files changed, 7 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec
index c1cdd7899..f4c8002e7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,7 +51,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be prepended with "0.", so
# for example a 3 here will become 0.3
#
-%global baserelease 2
+%global baserelease 1
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -84,7 +84,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 4
# The git snapshot level
-%define gitrev 0
+%define gitrev 3
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -1960,6 +1960,9 @@ fi
# ||----w |
# || ||
%changelog
+* Thu Feb 10 2011 Chuck Ebbert <cebbert@redhat.com> 2.6.38-0.rc4.git3.1
+- Linux 2.6.38-rc4-git3
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.38-0.rc4.git0.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/linux-2.6-ehci-check-port-status.patch b/linux-2.6-ehci-check-port-status.patch
index 6182c77cf..f3c5faf70 100644
--- a/linux-2.6-ehci-check-port-status.patch
+++ b/linux-2.6-ehci-check-port-status.patch
@@ -50,5 +50,5 @@ index 796ea0c..d9c0748 100644
- if (!suspending && (ehci_readl(ehci, &ehci->regs->status) & STS_PCD))
+ if (!suspending && ehci_port_change(ehci))
usb_hcd_resume_root_hub(ehci_to_hcd(ehci));
- }
+ spin_unlock_irqrestore(&ehci->lock, flags);
diff --git a/sources b/sources
index cf966168c..661b1d9d4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
c8ee37b4fdccdb651e0603d35350b434 linux-2.6.37.tar.bz2
8b5f3778a5d7e692a909c3af38ba48d1 patch-2.6.38-rc4.bz2
+2f49110768f86c316045e56840b0a978 patch-2.6.38-rc4-git3.bz2