[kernel/rawhide/user/myoung/xendom0: 31/32] Merge branch 'rawhide/user/kyle/kernel-git' into rawhide/user/myoung/xendom0
myoung
myoung at fedoraproject.org
Mon Jan 24 22:56:14 UTC 2011
commit 890c8ce6ae2054404991641b7a66d675a4832604
Merge: f5f5f6a 71f70cd
Author: Michael Young <m.a.young at durham.ac.uk>
Date: Mon Jan 24 21:47:01 2011 +0000
Merge branch 'rawhide/user/kyle/kernel-git' into rawhide/user/myoung/xendom0
Conflicts:
config-x86-generic
config-x86_64-generic
kernel.spec
...it-not-__exit-in-n2_unregister_algs-fixes.patch | 26 -
Makefile | 4 +
...-battery-information-on-notification-0x81.patch | 94 -
applesmc_update.patch | 2293 --------------------
config-arm | 6 +
config-debug | 2 +
config-generic | 94 +-
config-ia64-generic | 1 +
config-local | 2 +
config-nodebug | 2 +
config-powerpc-generic | 2 +
config-powerpc64 | 2 +
config-sparc64-generic | 4 +
config-x86-generic | 21 +-
config-x86_64-generic | 15 +-
drm-intel-big-hammer.patch | 12 +-
...-eDP-encoder-correctly-when-setting-modes.patch | 33 -
...-security_d_instantiate-in-d_obtain_alias.patch | 9 +-
kernel.spec | 158 +-
linux-2.6-32bit-mmap-exec-randomization.patch | 2 +-
linux-2.6-debug-nmi-timeout.patch | 45 -
linux-2.6-ehci-check-port-status.patch | 54 +
linux-2.6-i386-nx-emulation.patch | 2 +-
linux-2.6-serial-460800.patch | 4 +-
linux-2.6-silence-noise.patch | 32 +-
linux-2.6-tracehook.patch | 18 +-
linux-2.6-utrace-ptrace.patch | 165 +-
linux-2.6-utrace.patch | 54 +-
linux-next-macbook-air-input.patch | 185 --
...-cpu-counter-threshold-when-memory-is-low.patch | 389 ----
...-callback-for-adjusting-percpu-thresholds.patch | 167 --
net-AF_PACKET-vmalloc.patch | 254 ---
pci-disable-aspm-if-bios-asks-us-to.patch | 144 --
scripts/pull-upstreams.sh | 2 +-
sources | 1 +
35 files changed, 486 insertions(+), 3812 deletions(-)
---
diff --cc kernel.spec
index 595d79f,f2f62d4..34ff35d
--- a/kernel.spec
+++ b/kernel.spec
@@@ -222,12 -225,9 +226,12 @@@ Summary: The Linux kerne
%define debuginfodir /usr/lib/debug
# kernel-PAE is only built on i686.
+ %ifnarch i686
+ %define with_pae 0
+ %endif
+%ifarch i686
- %define with_pae 1
+%define with_up 0
- %else
- %define with_pae 0
+%endif
# if requested, only build base kernel
%if %{with_baseonly}
@@@ -723,22 -731,8 +735,17 @@@ Patch12303: dmar-disable-when-ricoh-mul
Patch12401: debug-tty-print-dev-name.patch
- Patch12410: mm-page-allocator-adjust-the-per-cpu-counter-threshold-when-memory-is-low.patch
- Patch12411: mm-vmstat-use-a-single-setter-function-and-callback-for-adjusting-percpu-thresholds.patch
-
Patch12421: fs-call-security_d_instantiate-in-d_obtain_alias.patch
- Patch12422: net-AF_PACKET-vmalloc.patch
-
+# Xen patches
+# git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git branches
+Patch20000: xen.next-2.6.37.patch
+#Patch20001: xen.upstream.core.patch
+# git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git branches
+Patch20005: xen.pcifront.fixes.patch
+# git://xenbits.xen.org/people/sstabellini/linux-pvhvm branches
+#Patch20010: xen.pvhvm.fixes.patch
+
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@@ -1350,19 -1346,6 +1359,12 @@@ ApplyPatch debug-tty-print-dev-name.pat
# rhbz#662344,600690
ApplyPatch fs-call-security_d_instantiate-in-d_obtain_alias.patch
- # rhbz#637619
- ApplyPatch net-AF_PACKET-vmalloc.patch
-
+# Xen patches
+ApplyPatch xen.next-2.6.37.patch
+#ApplyPatch xen.upstream.core.patch
+ApplyPatch xen.pcifront.fixes.patch
+#ApplyPatch xen.pvhvm.fixes.patch
+
# END OF PATCH APPLICATIONS
%endif
@@@ -1974,26 -1957,90 +1976,100 @@@ f
# (__)\ )\/\
# ||----w |
# || ||
-
%changelog
+ * Sat Jan 22 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc2.git0.1
+ - Linux 2.6.38-rc2
+ - linux-2.6-serial-460800.patch, drivers/serial => drivers/tty/serial
+
+ * Thu Jan 20 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc1.git1.1
+ - Linux 2.6.38-rc1-git1, should fix boot failure in -rc1.
+
+ * Wed Jan 19 2011 Roland McGrath <roland at redhat.com>
+ - utrace update
+
+ * Wed Jan 19 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc1.git0.1
+ - Linux 2.6.38-rc1
+
+ * Tue Jan 18 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc0.git18.1
+ - Linux 2.6.37-git18
+
+ * Mon Jan 17 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc0.git16.1
+ - Linux 2.6.37-git16
+ - config changes:
+ - CONFIG_SQUASHFS_XZ=y [generic]
+ - CONFIG_SPARSE_IRQ=y [arm]
+
+ * Sat Jan 15 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc0.git13.1
+ - Linux 2.6.37-git13
+ - Drop xen_export-arbitrary_virt_to_machine.patch, upstream.
+
+ * Fri Jan 14 2011 Kyle McMartin <kmcmartin at redhat.com>
+ - xen_export-arbitrary_virt_to_machine.patch: pull patch from upstream
+ to fix build error.
+
+ * Fri Jan 14 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc0.git12.1
+ - Linux 2.6.37-git12
+ - 0001-use-__devexit-not-__exit-in-n2_unregister_algs-fixes.patch: drop
+ upstream patch.
+ - acpi-update-battery-information-on-notification-0x81.patch: drop upstream
+ patch.
+ - mm-*.patch: drop upstream patches.
+ - important config changes:
+ ACPI_IPMI=m
+ CRYPTO_AES_NI_INTEL=m [i386]
+ TRANSPARENT_HUGEPAGE=y
+
+ * Wed Jan 12 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc0.git9.1
+ - Linux 2.6.37-git9
+ - Re-enable DEBUG_SET_MODULE_RONX since commit 94462ad3 fixed it.
+ - Enable some more new random HID and sensor junk as modules.
+
+ * Tue Jan 11 2011 Matthew Garrett <mjg at redhat.com>
+ - linux-2.6-ehci-check-port-status.patch - fix USB resume on some AMD systems
+
+ * Mon Jan 10 2011 Jarod Wilson <jarod at redhat.com>
+ - Add support for local rebuild config option overrides
+ - Add missing --with/--without pae build flag support
+
+ * Mon Jan 10 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc0.git4.2
+ - Disable DEBUG_SET_MODULE_RONX for now, it causes boot-up to fail since
+ dynamic ftrace is trying to rewrite instructions on module load.
+
+ * Mon Jan 10 2011 Kyle McMartin <kmcmartin at redhat.com>
+ - Drop obsolete linux-2.6-debug-nmi-timeout.patch
+
+ * Mon Jan 10 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.38-0.rc0.git4.1
+ - Branch for 2.6.38
+ - Rebase trivial patches.
+ - Switch debug configs back on.
+ - config changes:
+ DEBUG_SET_MODULE_RONX=y
+ B43_PHY_N=y
+ RT2800USB_RT33XX=y |
+ RT2800PCI_RT33XX=y | experimental
+ WL12XX=m
+ RTL8192CE=m
+ CAN_SLCAN=m
+ SCHED_AUTOGROUP=n
+
+* Sun Jan 09 2011 Michael Young <m.a.young at durham.ac.uk>
+- reorganize xen.pcifront.fixes.patch to be a combination of
+ stable/bug-fixes stable/generic and stable/irq.rework for fixes
+ in the previous stable/bug-fixes plus other fixes
+ also devel/ttm.pci-api.v3 for some KMS fixes
+
* Fri Jan 07 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.37-2
- drm_i915-check-eDP-encoder-correctly-when-setting-modes.patch reported to
fix HP/Sony eDP issues by adamw and airlied.
+* Wed Jan 05 2011 Michael Young <m.a.young at durham.ac.uk>
+- update xen.pcifront.fixes.patch with IRQ fixes from stable/bug-fixes branch
+- skip docs - it seems to cause build failures at random points the moment.
+
- * Wed Jan 05 2011 Dennis Gilmore <dennis at ausil.us>
+ * Wed Jan 05 2011 Dennis Gilmore <dennis at ausil.us>
- build sparc headers on sparcv9
- * Tue Jan 04 2011 Dennis Gilmore <dennis at ausil.us>
+ * Tue Jan 04 2011 Dennis Gilmore <dennis at ausil.us>
- add patch for sparc build failure
* Tue Jan 04 2011 Kyle McMartin <kyle at redhat.com> 2.6.37-1
More information about the scm-commits
mailing list