commit 521056633b4a25eb6661f821b3d82464b9d9aa6c
Merge: 194b658 a7940a1
Author: Michael Young <m.a.young(a)durham.ac.uk>
Date: Mon Feb 28 21:42:52 2011 +0000
Merge branch 'master' into rawhide/user/myoung/xendom0
Conflicts:
kernel.spec
ath5k-fix-fast-channel-change.patch | 213 -----
config-generic | 4 +-
drm-nouveau-updates.patch | 1334 +++++++++++++++++++++++++++++-
kernel.spec | 32 +-
linux-2.6-acpi-fix-implicit-notify.patch | 129 +++
sources | 1 +
usb-sierra-add-airprime-direct-ip.patch | 30 -
7 files changed, 1484 insertions(+), 259 deletions(-)
---
diff --cc kernel.spec
index 371413f,c2e6e9f..7c72fc7
--- a/kernel.spec
+++ b/kernel.spec
@@@ -737,21 -732,6 +738,16 @@@ Patch12303: dmar-disable-when-ricoh-mul
Patch12421: fs-call-security_d_instantiate-in-d_obtain_alias.patch
- Patch12438: ath5k-fix-fast-channel-change.patch
-
- # rhbz#676860
- Patch12441: usb-sierra-add-airprime-direct-ip.patch
-
+# Xen patches
+#
git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git branches
+#Patch20000: xen.next-2.6.38.patch
+#Patch20001: xen.upstream.core.patch
+#
git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git branches
+#Patch20005: xen.pcifront.fixes.patch
+Patch20006: xen.pcifront.next-2.6.38.patch
+#
git://xenbits.xen.org/people/sstabellini/linux-pvhvm branches
+#Patch20010: xen.pvhvm.fixes.patch
+
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@@ -1364,19 -1345,6 +1361,13 @@@ ApplyPatch dmar-disable-when-ricoh-mult
# rhbz#662344,600690
ApplyPatch fs-call-security_d_instantiate-in-d_obtain_alias.patch
- # rhbz#672778
- ApplyPatch ath5k-fix-fast-channel-change.patch
-
- # rhbz#676860
- ApplyPatch usb-sierra-add-airprime-direct-ip.patch
-
+# Xen patches
+#ApplyPatch xen.next-2.6.38.patch
+#ApplyPatch xen.upstream.core.patch
+#ApplyPatch xen.pcifront.fixes.patch
+ApplyPatch xen.pcifront.next-2.6.38.patch
+#ApplyPatch xen.pvhvm.fixes.patch
+
# END OF PATCH APPLICATIONS
%endif
@@@ -1980,9 -1948,23 +1971,26 @@@ f
# and build.
%changelog
+ * Fri Feb 25 2011 Chuck Ebbert <cebbert(a)redhat.com> 2.6.38-0.rc6.git6.1
+ - Linux 2.6.38-rc6-git6
+ - Build in virtio_pci driver so virtio_console will be built-in (#677713)
+
+ * Thu Feb 24 2011 Chuck Ebbert <cebbert(a)redhat.com> 2.6.38-0.rc6.git4.1
+ - Linux 2.6.38-rc6-git4
+
+ * Thu Feb 24 2011 Matthew Garrett <mjg(a)redhat.com> 2.6.38-0.rc6.git2.2
+ - linux-2.6-acpi-fix-implicit-notify.patch: Fix implicit notify when there's
+ more than one device per GPE
+
+ * Wed Feb 23 2011 Chuck Ebbert <cebbert(a)redhat.com> 2.6.38-0.rc6.git2.1
+ - Linux 2.6.38-rc6-git2
+
+ * Wed Feb 23 2011 Ben Skeggs <bskeggs(a)redhat.com> 2.6.38-0.rc6.git0.2
+ - nouveau: nv4x pciegart fixes, nvc0 accel improvements
+
+* Tue Feb 22 2011 Michael Young <m.a.young(a)durham.ac.uk>
+- update devel/next-2.6.38 and fix a mis-edit
+
* Tue Feb 22 2011 Kyle McMartin <kmcmartin(a)redhat.com> 2.6.38-0.rc6.git0.1
- Linux 2.6.38-rc6