rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into rawhide/user/myoung/xendom0 

Conflicts:
	kernel.spec
This commit is contained in:
Michael Young 2011-01-26 20:20:10 +00:00
parent 83389cd990 77886ddffa
commit 0bd53dc564
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config-x86-generic
View File

@ -534,7 +534,7 @@ CONFIG_JUMP_LABEL=y
CONFIG_X86_32_IRIS=m
CONFIG_TRANSPARENT_HUGEPAGE=y
# CONFIG_TRANSPARENT_HUGEPAGE is not set
CONFIG_CRYPTO_AES_NI_INTEL=m

5
kernel.spec
View File

@ -52,7 +52,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 1
%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@ -1976,6 +1976,9 @@ fi
# ||----w |
# || ||
%changelog
* Tue Jan 25 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc2.git3.2
- [x86] Disable TRANSPARENT_HUGEPAGE for now, there be dragons there.
* Tue Jan 25 2011 Michael Young <m.a.young@durham.ac.uk>
- Switch from xen/next-2.6.37 to xen/next-2.6.38
which adds XEN_NETDEV_BACKEND and XEN_PCIDEV_BACKEND