Accepting request 31581 from Kernel:HEAD

Copy from Kernel:HEAD/kernel-source based on submit request 31581 from user michal-m

OBS-URL: https://build.opensuse.org/request/show/31581
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kernel-source?expand=0&rev=84

apply-patches

@@ -0,0 +1,47 @@
+#!/bin/sh
+#
+# Given a series.conf file and a directory with patches, applies them to the
+# current directory.
+# Used by kernel-source.spec.in and kernel-binary.spec.in
+
+USAGE="$0 [--vanilla] <series.conf> <patchdir> [symbol ...]"
+
+set -e
+set -o pipefail
+vanilla=false
+if test "$1" == "--vanilla"; then
+	vanilla=true
+	shift
+fi
+if test $# -lt 2; then
+	echo "$USAGE" >&2
+	exit 1
+fi
+DIR="${0%/*}"
+SERIES_CONF=$1
+PATCH_DIR=$2
+shift 2
+
+trap 'rm -f "$series"' EXIT
+series=$(mktemp)
+# support for patches in patches.addon/series
+cp "$SERIES_CONF" "$series"
+if ! $vanilla && test -e "$PATCH_DIR/patches.addon/series"; then
+	# make it user-friendly and automatically prepend "patches.addon/"
+	# if there is no "/"
+	sed -r 's|^([[:space:]]*)([^#[:space:]][^/]*)$|\1patches.addon/\2|' \
+		"$PATCH_DIR/patches.addon/series" >>"$series"
+fi
+
+(
+	echo "trap 'echo \"*** patch \$_ failed ***\"' ERR"
+	echo "set -ex"
+	"$DIR"/guards "$@" <"$series" | \
+	if $vanilla; then
+		egrep '^patches\.(kernel\.org|rpmify)/'
+	else
+		cat
+	fi |\
+	sed "s|^|patch -s -F0 -E -p1 --no-backup-if-mismatch -i $PATCH_DIR/|"
+) | sh
+

config.conf

@@ -13,8 +13,8 @@
 +i386		i386/pae
 +i386 -syms	i386/vmi
 +i386 -syms	i386/debug
-#+i386		i386/xen
++i386		i386/xen
-#+i386 -syms	i386/ec2
++i386 -syms	i386/ec2
 +i386 		i386/vanilla
 +i386 -syms	i386/trace
 
@@ -25,8 +25,8 @@
 
 +x86_64		x86_64/default
 +x86_64		x86_64/desktop
-#+x86_64		x86_64/xen
++x86_64		x86_64/xen
-#+x86_64	-syms	x86_64/ec2
++x86_64	-syms	x86_64/ec2
 +x86_64	-syms	x86_64/debug
 +x86_64		x86_64/vanilla
 +x86_64 -syms	x86_64/trace

config.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2df2119a8d5095308e9ab3c3d810826e25a10abb0a1572783b78bd0c71a54ea1
+oid sha256:9b9e523a0be8f0af298d0b1e59ac7e92003c6a6c67efc5a44ab49e86a4ef081d
-size 161745
+size 202778

kernel-binary.spec.in

@@ -35,7 +35,7 @@
 %define rpm_install_dir %buildroot%obj_install_dir
 %define kernel_build_dir %my_builddir/linux-obj
 
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
 
 %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
 %define cpu_arch_flavor %cpu_arch/%build_flavor
@@ -247,15 +247,11 @@ supported_conf --default=0 base >%kernel_build_dir/Module.base
 
 cd linux-%srcversion
 
-# Apply patches
+%_sourcedir/apply-patches \
-echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
+%if %{build_vanilla}
-%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
+	--vanilla \
-%if %build_vanilla
-    egrep '^patches\.(kernel\.org|rpmify)/' | \
 %endif
-    sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \
+	%_sourcedir/series.conf .. $SYMBOLS
-    >>../apply-patches.sh
-bash -ex ../apply-patches.sh
 
 cd %kernel_build_dir
 
@@ -780,6 +776,7 @@ Group:          Development/Sources
 Provides:       multiversion(kernel)
 Provides:       %name-devel = %version-%source_rel
 Requires:       kernel-source%variant = %version-%source_rel
+Supplements:    packageand(%name:kernel-source)
 AutoReqProv:    on
 
 %description devel

kernel-debug.changes

@@ -1,3 +1,138 @@
+-------------------------------------------------------------------
+Thu Feb  4 13:23:57 CET 2010 - knikanth@suse.de
+
+- patches.fixes/dm-stripe-zero-stripes: dm-stripe: return -EINVAL
+  if stripe count is zero (bnc#576312).
+
+-------------------------------------------------------------------
+Thu Feb  4 12:17:25 CET 2010 - npiggin@suse.de
+
+- Disable patches.suse/files-slab-rcu.patch.
+
+-------------------------------------------------------------------
+Thu Feb  4 09:46:35 CET 2010 - tiwai@suse.de
+
+- supported.conf: mark snd-wss-lib unsupported
+
+-------------------------------------------------------------------
+Thu Feb  4 09:45:34 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2:
+  ALSA: hda - Adding support for another IDT 92HD83XXX codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Wed Feb  3 19:17:01 CET 2010 - jbohac@suse.cz
+
+- supported.conf: marked em_cmp supported (bnc#568130)
+
+-------------------------------------------------------------------
+Wed Feb  3 14:57:19 CET 2010 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: automatically install a matching
+  -devel package if kernel-source is installed.
+
+-------------------------------------------------------------------
+Wed Feb  3 13:06:15 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc6 and c/s 989.
+- patches.xen/xen-netback-generalize: Netback: Generalize
+  static/global variables into 'struct xen_netbk'.
+- patches.xen/xen-netback-kernel-threads: Use Kernel thread to
+  replace the tasklet.
+- patches.xen/xen-netback-multiple-tasklets: Netback:
+  Multiple tasklets support.
+
+-------------------------------------------------------------------
+Tue Feb  2 15:59:38 CET 2010 - jkosina@suse.cz
+
+- patches.suse/suse-ppc64-branding: the message about crashed kernel
+  doesn't make sense any more with CONFIG_CRASH_DUMP enabled by
+  default (bnc#575884).
+
+-------------------------------------------------------------------
+Sat Jan 30 21:51:35 CET 2010 - jeffm@suse.com
+
+- Update to 2.6.33-rc6.
+  - Eliminated 12 patches.
+
+-------------------------------------------------------------------
+Sat Jan 30 21:30:27 CET 2010 - jeffm@suse.com
+
+- patches.rpmify/hugetlbfs-fix-section-mismatches: Removed __init
+  from hugetlb_sysfs_add_hstate instead of adding it elsewhere.
+
+-------------------------------------------------------------------
+Sat Jan 30 09:05:13 CET 2010 - jslaby@suse.de
+
+- patches.suse/kdb-common: Fix hid crash (bnc#570591)
+
+-------------------------------------------------------------------
+Fri Jan 29 12:11:55 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support: ALSA:
+  hda - Add support for IDT 92HD88 family codecs (bnc#569354).
+
+-------------------------------------------------------------------
+Fri Jan 29 11:14:39 CET 2010 - jkosina@suse.cz
+
+- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch:
+  Update patch-mainline tag.
+
+-------------------------------------------------------------------
+Fri Jan 29 10:39:59 CET 2010 - jbenc@suse.cz
+
+- Update config files: fixed vanilla configs.
+
+-------------------------------------------------------------------
+Thu Jan 28 19:27:54 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led: ALSA:
+  hda - Add mute LED check for HP laptops with IDT 92HD83xxx codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Thu Jan 28 16:56:02 CET 2010 - jbeulich@novell.com
+
+- patches.suse/supported-flag: Fix -ec2 build.
+- patches.suse/supported-flag-enterprise: Refresh.
+- patches.xen/xen3-patch-2.6.33-rc3: Fix ia64 build.
+
+-------------------------------------------------------------------
+Thu Jan 28 16:28:01 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc5 and c/s 987.
+- config.conf: Re-enable Xen.
+- Update config files.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:50:18 CET 2010 - jbenc@suse.cz
+
+- Update config files: enabled CONFIG_CFG80211_WEXT to keep backward
+  user space compatibility and enabled few wireless drivers.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:37:22 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: Add support for an additional series file in
+  patches.addon/series, this will be applied after the main series.
+
+-------------------------------------------------------------------
+Thu Jan 28 11:17:01 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: put the patch loops from kernel-binary.spec.in
+  and kernel-source.spec.in to one place.
+
+-------------------------------------------------------------------
+Wed Jan 27 20:24:43 CET 2010 - jeffm@suse.de
+
+- Deleted 28 unused patches.
+
+-------------------------------------------------------------------
+Wed Jan 27 15:56:48 CET 2010 - jeffm@suse.com
+
+- Update config files.
+
 -------------------------------------------------------------------
 Wed Jan 27 14:55:29 CET 2010 - jkosina@suse.cz
 

kernel-debug.spec

@@ -18,7 +18,7 @@
 # norootforbuild
 
 %define srcversion 2.6.32
-%define patchversion 2.6.33-rc5
+%define patchversion 2.6.33-rc6
 %define variant %{nil}
 %include %_sourcedir/kernel-spec-macros
 %define build_flavor	debug
@@ -31,7 +31,7 @@
 %define obj_install_dir %src_install_dir-obj
 %define rpm_install_dir %buildroot%obj_install_dir
 %define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
 %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
 %define cpu_arch_flavor %cpu_arch/%build_flavor
 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
@@ -49,7 +49,7 @@
 Name:           kernel-debug
 Summary:        A Debug Version of the Kernel
 Version:        2.6.33
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif
@@ -229,15 +229,11 @@ supported_conf() {
 } > %kernel_build_dir/Module.supported
 supported_conf --default=0 base >%kernel_build_dir/Module.base
 cd linux-%srcversion
-# Apply patches
+%_sourcedir/apply-patches \
-echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
+%if %{build_vanilla}
-%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
+	--vanilla \
-%if %build_vanilla
-    egrep '^patches\.(kernel\.org|rpmify)/' | \
 %endif
-    sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \
+	%_sourcedir/series.conf .. $SYMBOLS
-    >>../apply-patches.sh
-bash -ex ../apply-patches.sh
 cd %kernel_build_dir
 if [ -f %_sourcedir/localversion ] ; then
     cat %_sourcedir/localversion > localversion
@@ -723,6 +719,7 @@ Group:          Development/Sources
 Provides:       multiversion(kernel)
 Provides:       %name-devel = %version-%source_rel
 Requires:       kernel-source%variant = %version-%source_rel
+Supplements:    packageand(%name:kernel-source)
 AutoReqProv:    on
 
 %description devel

kernel-default.changes

@@ -1,3 +1,138 @@
+-------------------------------------------------------------------
+Thu Feb  4 13:23:57 CET 2010 - knikanth@suse.de
+
+- patches.fixes/dm-stripe-zero-stripes: dm-stripe: return -EINVAL
+  if stripe count is zero (bnc#576312).
+
+-------------------------------------------------------------------
+Thu Feb  4 12:17:25 CET 2010 - npiggin@suse.de
+
+- Disable patches.suse/files-slab-rcu.patch.
+
+-------------------------------------------------------------------
+Thu Feb  4 09:46:35 CET 2010 - tiwai@suse.de
+
+- supported.conf: mark snd-wss-lib unsupported
+
+-------------------------------------------------------------------
+Thu Feb  4 09:45:34 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2:
+  ALSA: hda - Adding support for another IDT 92HD83XXX codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Wed Feb  3 19:17:01 CET 2010 - jbohac@suse.cz
+
+- supported.conf: marked em_cmp supported (bnc#568130)
+
+-------------------------------------------------------------------
+Wed Feb  3 14:57:19 CET 2010 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: automatically install a matching
+  -devel package if kernel-source is installed.
+
+-------------------------------------------------------------------
+Wed Feb  3 13:06:15 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc6 and c/s 989.
+- patches.xen/xen-netback-generalize: Netback: Generalize
+  static/global variables into 'struct xen_netbk'.
+- patches.xen/xen-netback-kernel-threads: Use Kernel thread to
+  replace the tasklet.
+- patches.xen/xen-netback-multiple-tasklets: Netback:
+  Multiple tasklets support.
+
+-------------------------------------------------------------------
+Tue Feb  2 15:59:38 CET 2010 - jkosina@suse.cz
+
+- patches.suse/suse-ppc64-branding: the message about crashed kernel
+  doesn't make sense any more with CONFIG_CRASH_DUMP enabled by
+  default (bnc#575884).
+
+-------------------------------------------------------------------
+Sat Jan 30 21:51:35 CET 2010 - jeffm@suse.com
+
+- Update to 2.6.33-rc6.
+  - Eliminated 12 patches.
+
+-------------------------------------------------------------------
+Sat Jan 30 21:30:27 CET 2010 - jeffm@suse.com
+
+- patches.rpmify/hugetlbfs-fix-section-mismatches: Removed __init
+  from hugetlb_sysfs_add_hstate instead of adding it elsewhere.
+
+-------------------------------------------------------------------
+Sat Jan 30 09:05:13 CET 2010 - jslaby@suse.de
+
+- patches.suse/kdb-common: Fix hid crash (bnc#570591)
+
+-------------------------------------------------------------------
+Fri Jan 29 12:11:55 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support: ALSA:
+  hda - Add support for IDT 92HD88 family codecs (bnc#569354).
+
+-------------------------------------------------------------------
+Fri Jan 29 11:14:39 CET 2010 - jkosina@suse.cz
+
+- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch:
+  Update patch-mainline tag.
+
+-------------------------------------------------------------------
+Fri Jan 29 10:39:59 CET 2010 - jbenc@suse.cz
+
+- Update config files: fixed vanilla configs.
+
+-------------------------------------------------------------------
+Thu Jan 28 19:27:54 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led: ALSA:
+  hda - Add mute LED check for HP laptops with IDT 92HD83xxx codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Thu Jan 28 16:56:02 CET 2010 - jbeulich@novell.com
+
+- patches.suse/supported-flag: Fix -ec2 build.
+- patches.suse/supported-flag-enterprise: Refresh.
+- patches.xen/xen3-patch-2.6.33-rc3: Fix ia64 build.
+
+-------------------------------------------------------------------
+Thu Jan 28 16:28:01 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc5 and c/s 987.
+- config.conf: Re-enable Xen.
+- Update config files.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:50:18 CET 2010 - jbenc@suse.cz
+
+- Update config files: enabled CONFIG_CFG80211_WEXT to keep backward
+  user space compatibility and enabled few wireless drivers.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:37:22 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: Add support for an additional series file in
+  patches.addon/series, this will be applied after the main series.
+
+-------------------------------------------------------------------
+Thu Jan 28 11:17:01 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: put the patch loops from kernel-binary.spec.in
+  and kernel-source.spec.in to one place.
+
+-------------------------------------------------------------------
+Wed Jan 27 20:24:43 CET 2010 - jeffm@suse.de
+
+- Deleted 28 unused patches.
+
+-------------------------------------------------------------------
+Wed Jan 27 15:56:48 CET 2010 - jeffm@suse.com
+
+- Update config files.
+
 -------------------------------------------------------------------
 Wed Jan 27 14:55:29 CET 2010 - jkosina@suse.cz
 

kernel-default.spec

@@ -18,7 +18,7 @@
 # norootforbuild
 
 %define srcversion 2.6.32
-%define patchversion 2.6.33-rc5
+%define patchversion 2.6.33-rc6
 %define variant %{nil}
 %include %_sourcedir/kernel-spec-macros
 %define build_flavor	default
@@ -31,7 +31,7 @@
 %define obj_install_dir %src_install_dir-obj
 %define rpm_install_dir %buildroot%obj_install_dir
 %define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
 %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
 %define cpu_arch_flavor %cpu_arch/%build_flavor
 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
@@ -49,7 +49,7 @@
 Name:           kernel-default
 Summary:        The Standard Kernel
 Version:        2.6.33
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif
@@ -244,15 +244,11 @@ supported_conf() {
 } > %kernel_build_dir/Module.supported
 supported_conf --default=0 base >%kernel_build_dir/Module.base
 cd linux-%srcversion
-# Apply patches
+%_sourcedir/apply-patches \
-echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
+%if %{build_vanilla}
-%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
+	--vanilla \
-%if %build_vanilla
-    egrep '^patches\.(kernel\.org|rpmify)/' | \
 %endif
-    sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \
+	%_sourcedir/series.conf .. $SYMBOLS
-    >>../apply-patches.sh
-bash -ex ../apply-patches.sh
 cd %kernel_build_dir
 if [ -f %_sourcedir/localversion ] ; then
     cat %_sourcedir/localversion > localversion
@@ -736,6 +732,7 @@ Group:          Development/Sources
 Provides:       multiversion(kernel)
 Provides:       %name-devel = %version-%source_rel
 Requires:       kernel-source%variant = %version-%source_rel
+Supplements:    packageand(%name:kernel-source)
 AutoReqProv:    on
 
 %description devel

kernel-desktop.changes

@@ -1,3 +1,138 @@
+-------------------------------------------------------------------
+Thu Feb  4 13:23:57 CET 2010 - knikanth@suse.de
+
+- patches.fixes/dm-stripe-zero-stripes: dm-stripe: return -EINVAL
+  if stripe count is zero (bnc#576312).
+
+-------------------------------------------------------------------
+Thu Feb  4 12:17:25 CET 2010 - npiggin@suse.de
+
+- Disable patches.suse/files-slab-rcu.patch.
+
+-------------------------------------------------------------------
+Thu Feb  4 09:46:35 CET 2010 - tiwai@suse.de
+
+- supported.conf: mark snd-wss-lib unsupported
+
+-------------------------------------------------------------------
+Thu Feb  4 09:45:34 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2:
+  ALSA: hda - Adding support for another IDT 92HD83XXX codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Wed Feb  3 19:17:01 CET 2010 - jbohac@suse.cz
+
+- supported.conf: marked em_cmp supported (bnc#568130)
+
+-------------------------------------------------------------------
+Wed Feb  3 14:57:19 CET 2010 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: automatically install a matching
+  -devel package if kernel-source is installed.
+
+-------------------------------------------------------------------
+Wed Feb  3 13:06:15 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc6 and c/s 989.
+- patches.xen/xen-netback-generalize: Netback: Generalize
+  static/global variables into 'struct xen_netbk'.
+- patches.xen/xen-netback-kernel-threads: Use Kernel thread to
+  replace the tasklet.
+- patches.xen/xen-netback-multiple-tasklets: Netback:
+  Multiple tasklets support.
+
+-------------------------------------------------------------------
+Tue Feb  2 15:59:38 CET 2010 - jkosina@suse.cz
+
+- patches.suse/suse-ppc64-branding: the message about crashed kernel
+  doesn't make sense any more with CONFIG_CRASH_DUMP enabled by
+  default (bnc#575884).
+
+-------------------------------------------------------------------
+Sat Jan 30 21:51:35 CET 2010 - jeffm@suse.com
+
+- Update to 2.6.33-rc6.
+  - Eliminated 12 patches.
+
+-------------------------------------------------------------------
+Sat Jan 30 21:30:27 CET 2010 - jeffm@suse.com
+
+- patches.rpmify/hugetlbfs-fix-section-mismatches: Removed __init
+  from hugetlb_sysfs_add_hstate instead of adding it elsewhere.
+
+-------------------------------------------------------------------
+Sat Jan 30 09:05:13 CET 2010 - jslaby@suse.de
+
+- patches.suse/kdb-common: Fix hid crash (bnc#570591)
+
+-------------------------------------------------------------------
+Fri Jan 29 12:11:55 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support: ALSA:
+  hda - Add support for IDT 92HD88 family codecs (bnc#569354).
+
+-------------------------------------------------------------------
+Fri Jan 29 11:14:39 CET 2010 - jkosina@suse.cz
+
+- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch:
+  Update patch-mainline tag.
+
+-------------------------------------------------------------------
+Fri Jan 29 10:39:59 CET 2010 - jbenc@suse.cz
+
+- Update config files: fixed vanilla configs.
+
+-------------------------------------------------------------------
+Thu Jan 28 19:27:54 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led: ALSA:
+  hda - Add mute LED check for HP laptops with IDT 92HD83xxx codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Thu Jan 28 16:56:02 CET 2010 - jbeulich@novell.com
+
+- patches.suse/supported-flag: Fix -ec2 build.
+- patches.suse/supported-flag-enterprise: Refresh.
+- patches.xen/xen3-patch-2.6.33-rc3: Fix ia64 build.
+
+-------------------------------------------------------------------
+Thu Jan 28 16:28:01 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc5 and c/s 987.
+- config.conf: Re-enable Xen.
+- Update config files.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:50:18 CET 2010 - jbenc@suse.cz
+
+- Update config files: enabled CONFIG_CFG80211_WEXT to keep backward
+  user space compatibility and enabled few wireless drivers.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:37:22 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: Add support for an additional series file in
+  patches.addon/series, this will be applied after the main series.
+
+-------------------------------------------------------------------
+Thu Jan 28 11:17:01 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: put the patch loops from kernel-binary.spec.in
+  and kernel-source.spec.in to one place.
+
+-------------------------------------------------------------------
+Wed Jan 27 20:24:43 CET 2010 - jeffm@suse.de
+
+- Deleted 28 unused patches.
+
+-------------------------------------------------------------------
+Wed Jan 27 15:56:48 CET 2010 - jeffm@suse.com
+
+- Update config files.
+
 -------------------------------------------------------------------
 Wed Jan 27 14:55:29 CET 2010 - jkosina@suse.cz
 

kernel-desktop.spec

@@ -18,7 +18,7 @@
 # norootforbuild
 
 %define srcversion 2.6.32
-%define patchversion 2.6.33-rc5
+%define patchversion 2.6.33-rc6
 %define variant %{nil}
 %include %_sourcedir/kernel-spec-macros
 %define build_flavor	desktop
@@ -31,7 +31,7 @@
 %define obj_install_dir %src_install_dir-obj
 %define rpm_install_dir %buildroot%obj_install_dir
 %define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
 %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
 %define cpu_arch_flavor %cpu_arch/%build_flavor
 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
@@ -49,7 +49,7 @@
 Name:           kernel-desktop
 Summary:        Kernel optimized for the desktop
 Version:        2.6.33
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif
@@ -235,15 +235,11 @@ supported_conf() {
 } > %kernel_build_dir/Module.supported
 supported_conf --default=0 base >%kernel_build_dir/Module.base
 cd linux-%srcversion
-# Apply patches
+%_sourcedir/apply-patches \
-echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
+%if %{build_vanilla}
-%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
+	--vanilla \
-%if %build_vanilla
-    egrep '^patches\.(kernel\.org|rpmify)/' | \
 %endif
-    sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \
+	%_sourcedir/series.conf .. $SYMBOLS
-    >>../apply-patches.sh
-bash -ex ../apply-patches.sh
 cd %kernel_build_dir
 if [ -f %_sourcedir/localversion ] ; then
     cat %_sourcedir/localversion > localversion
@@ -747,6 +743,7 @@ Group:          Development/Sources
 Provides:       multiversion(kernel)
 Provides:       %name-devel = %version-%source_rel
 Requires:       kernel-source%variant = %version-%source_rel
+Supplements:    packageand(%name:kernel-source)
 AutoReqProv:    on
 
 %description devel

kernel-docs.changes

@@ -1,3 +1,138 @@
+-------------------------------------------------------------------
+Thu Feb  4 13:23:57 CET 2010 - knikanth@suse.de
+
+- patches.fixes/dm-stripe-zero-stripes: dm-stripe: return -EINVAL
+  if stripe count is zero (bnc#576312).
+
+-------------------------------------------------------------------
+Thu Feb  4 12:17:25 CET 2010 - npiggin@suse.de
+
+- Disable patches.suse/files-slab-rcu.patch.
+
+-------------------------------------------------------------------
+Thu Feb  4 09:46:35 CET 2010 - tiwai@suse.de
+
+- supported.conf: mark snd-wss-lib unsupported
+
+-------------------------------------------------------------------
+Thu Feb  4 09:45:34 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2:
+  ALSA: hda - Adding support for another IDT 92HD83XXX codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Wed Feb  3 19:17:01 CET 2010 - jbohac@suse.cz
+
+- supported.conf: marked em_cmp supported (bnc#568130)
+
+-------------------------------------------------------------------
+Wed Feb  3 14:57:19 CET 2010 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: automatically install a matching
+  -devel package if kernel-source is installed.
+
+-------------------------------------------------------------------
+Wed Feb  3 13:06:15 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc6 and c/s 989.
+- patches.xen/xen-netback-generalize: Netback: Generalize
+  static/global variables into 'struct xen_netbk'.
+- patches.xen/xen-netback-kernel-threads: Use Kernel thread to
+  replace the tasklet.
+- patches.xen/xen-netback-multiple-tasklets: Netback:
+  Multiple tasklets support.
+
+-------------------------------------------------------------------
+Tue Feb  2 15:59:38 CET 2010 - jkosina@suse.cz
+
+- patches.suse/suse-ppc64-branding: the message about crashed kernel
+  doesn't make sense any more with CONFIG_CRASH_DUMP enabled by
+  default (bnc#575884).
+
+-------------------------------------------------------------------
+Sat Jan 30 21:51:35 CET 2010 - jeffm@suse.com
+
+- Update to 2.6.33-rc6.
+  - Eliminated 12 patches.
+
+-------------------------------------------------------------------
+Sat Jan 30 21:30:27 CET 2010 - jeffm@suse.com
+
+- patches.rpmify/hugetlbfs-fix-section-mismatches: Removed __init
+  from hugetlb_sysfs_add_hstate instead of adding it elsewhere.
+
+-------------------------------------------------------------------
+Sat Jan 30 09:05:13 CET 2010 - jslaby@suse.de
+
+- patches.suse/kdb-common: Fix hid crash (bnc#570591)
+
+-------------------------------------------------------------------
+Fri Jan 29 12:11:55 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support: ALSA:
+  hda - Add support for IDT 92HD88 family codecs (bnc#569354).
+
+-------------------------------------------------------------------
+Fri Jan 29 11:14:39 CET 2010 - jkosina@suse.cz
+
+- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch:
+  Update patch-mainline tag.
+
+-------------------------------------------------------------------
+Fri Jan 29 10:39:59 CET 2010 - jbenc@suse.cz
+
+- Update config files: fixed vanilla configs.
+
+-------------------------------------------------------------------
+Thu Jan 28 19:27:54 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led: ALSA:
+  hda - Add mute LED check for HP laptops with IDT 92HD83xxx codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Thu Jan 28 16:56:02 CET 2010 - jbeulich@novell.com
+
+- patches.suse/supported-flag: Fix -ec2 build.
+- patches.suse/supported-flag-enterprise: Refresh.
+- patches.xen/xen3-patch-2.6.33-rc3: Fix ia64 build.
+
+-------------------------------------------------------------------
+Thu Jan 28 16:28:01 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc5 and c/s 987.
+- config.conf: Re-enable Xen.
+- Update config files.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:50:18 CET 2010 - jbenc@suse.cz
+
+- Update config files: enabled CONFIG_CFG80211_WEXT to keep backward
+  user space compatibility and enabled few wireless drivers.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:37:22 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: Add support for an additional series file in
+  patches.addon/series, this will be applied after the main series.
+
+-------------------------------------------------------------------
+Thu Jan 28 11:17:01 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: put the patch loops from kernel-binary.spec.in
+  and kernel-source.spec.in to one place.
+
+-------------------------------------------------------------------
+Wed Jan 27 20:24:43 CET 2010 - jeffm@suse.de
+
+- Deleted 28 unused patches.
+
+-------------------------------------------------------------------
+Wed Jan 27 15:56:48 CET 2010 - jeffm@suse.com
+
+- Update config files.
+
 -------------------------------------------------------------------
 Wed Jan 27 14:55:29 CET 2010 - jkosina@suse.cz
 

kernel-docs.spec

@@ -27,7 +27,7 @@ License:        GPLv2+
 Group:          Documentation/Man
 AutoReqProv:    on
 Version:        2.6.33
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif

kernel-ec2.spec

@@ -0,0 +1,766 @@
+#
+# spec file for package kernel-ec2 (Version 2.6.33)
+#
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+# norootforbuild
+
+%define srcversion 2.6.32
+%define patchversion 2.6.33-rc6
+%define variant %{nil}
+%include %_sourcedir/kernel-spec-macros
+%define build_flavor	ec2
+%define build_kdump	(%build_flavor == "kdump")
+%define build_xen	(%build_flavor == "xen" || %build_flavor == "ec2")
+%define build_vanilla	(%build_flavor == "vanilla")
+%define build_ps3	(%build_flavor == "ps3")
+%define build_src_dir %my_builddir/linux-%srcversion
+%define src_install_dir /usr/src/linux-%kernelrelease%variant
+%define obj_install_dir %src_install_dir-obj
+%define rpm_install_dir %buildroot%obj_install_dir
+%define kernel_build_dir %my_builddir/linux-obj
+%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
+%define cpu_arch_flavor %cpu_arch/%build_flavor
+# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
+# defining them all at once.)
+%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
+%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
+%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
+%ifarch %ix86 x86_64
+%define install_vdso 1
+%else
+%define install_vdso 0
+%endif
+
+Name:           kernel-ec2
+Summary:        The Amazon EC2 Xen Kernel
+Version:        2.6.33
+Release:        1
+%if %using_buildservice
+%else
+%endif
+License:        GPLv2
+Group:          System/Kernel
+Url:            http://www.kernel.org/
+AutoReqProv:    on
+BuildRequires:  coreutils module-init-tools sparse
+BuildRequires:  fdupes
+Provides:       multiversion(kernel)
+Provides:       %{name}_%_target_cpu = %version-%release
+%if %split_base
+Provides:       kernel-base = %version-%source_rel
+# Obsolete the -base subpackage from 11.1 and 11.2 development phase
+Obsoletes:      %name-base <= 2.6.31
+%endif
+Requires(pre):  coreutils awk
+# Need a module-init-tools with /usr/lib/module-init-tools/weak-modules2
+Requires(post): module-init-tools >= 3.4
+# This Requires is wrong, because the post/postun scripts have a
+# test -x update-bootloader, having perl-Bootloader is not a hard requirement.
+# But, there is no way to tell rpm or yast to schedule the installation
+# of perl-Bootloader before kernel-binary.rpm if both are in the list of
+# packages to install/update. Likewise, this is true for mkinitrd.
+# Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry
+Requires(post): perl-Bootloader >= 0.4.15
+Requires(post): mkinitrd
+#!BuildIgnore:  perl-Bootloader mkinitrd
+%ifarch ia64
+# arch/ia64/scripts/unwcheck.py
+BuildRequires:  python
+%endif
+%ifarch s390 s390x
+%if %build_vanilla
+BuildRequires:  dwarfextract
+%endif
+%endif
+%if %build_xen
+%ifarch %ix86
+%if %build_flavor != "ec2"
+Provides:       kernel-xenpae = %version
+Obsoletes:      kernel-xenpae <= %version
+%endif
+%endif
+#!BuildIgnore:  xen
+%endif
+Provides:       %name-nongpl
+Obsoletes:      %name-nongpl
+%if %build_vanilla
+# force bzip2 instead of lzma compression to allow install on older dist versions
+%define _binary_payload w9.bzdio
+%endif
+# dead network if installed on SLES10, otherwise it will work (mostly)
+Conflicts:      sysfsutils < 2.0
+%if ! %build_vanilla
+Conflicts:      apparmor-profiles <= 2.1
+Conflicts:      apparmor-parser < 2.3
+# root-lvm only works with newer udevs
+Conflicts:      udev < 118
+Conflicts:      lvm2 < 2.02.33
+%endif
+%ifarch %ix86
+Conflicts:      libc.so.6()(64bit)
+%endif
+Provides:       kernel = %version-%source_rel
+Source0:        http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
+Source10:       preun.sh
+Source11:       postun.sh
+Source12:       pre.sh
+Source13:       post.sh
+Source20:       series.conf
+Source22:       supported.conf
+Source30:       arch-symbols
+Source31:       guards
+Source33:       check-for-config-changes
+Source34:       check-supported-list
+Source40:       source-timestamp
+Source44:       find-provides
+Source46:       modversions
+Source47:       kabi.pl
+Source48:       split-modules
+Source49:       kernel-spec-macros
+Source100:      config.tar.bz2
+Source101:      patches.arch.tar.bz2
+Source102:      patches.drivers.tar.bz2
+Source103:      patches.fixes.tar.bz2
+Source104:      patches.rpmify.tar.bz2
+Source105:      patches.suse.tar.bz2
+Source107:      patches.xen.tar.bz2
+Source108:      patches.addon.tar.bz2
+Source109:      patches.kernel.org.tar.bz2
+Source110:      patches.apparmor.tar.bz2
+Source111:      patches.rt.tar.bz2
+Source112:      patches.trace.tar.bz2
+Source113:      patches.kabi.tar.bz2
+Source120:      kabi.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+ExclusiveArch:  %ix86 x86_64
+# These files are found in the kernel-source package:
+NoSource:       0
+NoSource:       100
+NoSource:       101
+NoSource:       102
+NoSource:       103
+NoSource:       104
+NoSource:       105
+NoSource:       107
+NoSource:       108
+NoSource:       109
+NoSource:       110
+NoSource:       111
+NoSource:       120
+# The following KMPs have been integrated into the kernel package.
+# sles10 / 10.3
+Obsoletes:      iwlwifi-kmp-%build_flavor
+Obsoletes:      ipw3945-kmp-%build_flavor
+# sles10 / 11.0
+Obsoletes:      uvcvideo-kmp-%build_flavor
+# 10.3
+Obsoletes:      adm8211-kmp-%build_flavor
+Obsoletes:      rt2x00-kmp-%build_flavor
+Obsoletes:      rfswitch-kmp-%build_flavor
+# 11.0
+Obsoletes:      atl2-kmp-%build_flavor
+Obsoletes:      wlan-ng-kmp-%build_flavor
+Obsoletes:      et131x-kmp-%build_flavor
+Obsoletes:      ivtv-kmp-%build_flavor
+Obsoletes:      at76_usb-kmp-%build_flavor
+Obsoletes:      pcc-acpi-kmp-%build_flavor
+Obsoletes:      btusb-kmp-%build_flavor
+# sle11-ga
+Obsoletes:      enic-kmp-%build_flavor
+Obsoletes:      fnic-kmp-%build_flavor
+Obsoletes:      brocade-bfa-kmp-%build_flavor
+Obsoletes:      kvm-kmp-%build_flavor
+Obsoletes:      perfmon-kmp-%build_flavor
+# sle11
+Obsoletes:      ocfs2-kmp-%build_flavor
+# 11.1
+Obsoletes:      quickcam-kmp-%build_flavor < 0.6.7
+# Provide the exported symbols as "ksym(symbol) = hash"
+%define __find_provides %_sourcedir/find-provides %my_builddir %name
+# Will modules not listed in supported.conf abort the kernel build (0/1)?
+%define supported_modules_check 0
+
+%description
+The Linux kernel for Xen paravirtualization.
+
+This kernel can only be used both as an unprivileged ("xenU")
+kernel (for Amazon EC2).
+
+
+%source_timestamp
+%prep
+if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
+    echo "The %name-%version.nosrc.rpm package does not contain the" \
+	 "complete sources. Please install kernel-source-%version.src.rpm."
+    exit 1
+fi
+SYMBOLS=
+if test -e %_sourcedir/extra-symbols; then
+	SYMBOLS=$(cat %_sourcedir/extra-symbols)
+	echo "extra symbol(s):" $SYMBOLS
+fi
+# Unpack all sources and patches
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+mkdir -p %kernel_build_dir
+supported_conf() {
+	%_sourcedir/guards $* < %_sourcedir/supported.conf | \
+	sed 's,.*/,,; s,\.ko$,,' | sort -u
+}
+# Generate the list of modules to be marked as supported
+{   supported_conf base
+    supported_conf --default=0 external | sed 's/$/ external/'
+} > %kernel_build_dir/Module.supported
+supported_conf --default=0 base >%kernel_build_dir/Module.base
+cd linux-%srcversion
+%_sourcedir/apply-patches \
+%if %{build_vanilla}
+	--vanilla \
+%endif
+	%_sourcedir/series.conf .. $SYMBOLS
+cd %kernel_build_dir
+if [ -f %_sourcedir/localversion ] ; then
+    cat %_sourcedir/localversion > localversion
+fi
+cp ../config/%cpu_arch_flavor .config
+%build_src_dir/scripts/config \
+	--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+	--enable  CONFIG_SUSE_KERNEL \
+%if 0%{?__debug_package:1}
+	--enable  CONFIG_DEBUG_INFO
+%else
+	--disable CONFIG_DEBUG_INFO
+%endif
+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
+if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
+    yes '' | make oldconfig $MAKE_ARGS
+else
+    cp .config .config.orig
+    make silentoldconfig $MAKE_ARGS < /dev/null
+    %_sourcedir/check-for-config-changes .config.orig .config
+    rm .config.orig
+fi
+make prepare $MAKE_ARGS
+make scripts $MAKE_ARGS
+krel=$(make -s kernelrelease $MAKE_ARGS)
+if [ "$krel" != "%kernelrelease-%build_flavor" ]; then
+    echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2
+    exit 1
+fi
+make clean $MAKE_ARGS
+rm -f source
+find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
+cat > .kernel-binary.spec.buildenv <<EOF
+# Override the timestamp 'uname -v' reports with the build
+# timestamp.
+export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')"
+export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
+# The following branch/timestamp will end up in Oopses.
+export OOPS_TIMESTAMP="$(
+    echo -n $(sed -ne 's/^GIT Branch: \(.*\)/\1-/p' \
+		  %_sourcedir/source-timestamp)
+    head -n 1 %_sourcedir/source-timestamp \
+	| tr -dc 0-9)"
+export KBUILD_VERBOSE=0
+export KBUILD_SYMTYPES=1
+export KBUILD_OVERRIDE=1
+EOF
+
+%build
+cd %kernel_build_dir
+source .kernel-binary.spec.buildenv
+# create *.symref files in the tree
+if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
+    %_sourcedir/modversions --unpack . < $_
+fi
+# If the %jobs macro is defined to a number, make will spawn that many jobs.
+# There are several ways how to define it:
+# If you are using the build script:
+#     build --jobs=N kernel-$flavor.spec
+# With plain rpmbuild:
+#     rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
+# To spawn as many jobs as there are cpu cores:
+#     rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
+#         kernel-$flavor.spec
+# You can also set this permanently in ~/.rpmmacros:
+#     %jobs 0%(grep -c ^processor /proc/cpuinfo)
+%if %CONFIG_KMSG_IDS == "y"
+    chmod +x ../linux-%srcversion/scripts/kmsg-doc
+    make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
+%else
+    make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
+%endif
+
+%install
+# get rid of /usr/lib/rpm/brp-strip-debug
+# strip removes too much from the vmlinux ELF binary
+export NO_BRP_STRIP_DEBUG=true
+# /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the
+# kernel-source package is installed. Don't check for stale symlinks
+# in the brp-symlink check:
+export NO_BRP_STALE_LINK_ERROR=yes
+cd %kernel_build_dir
+mkdir -p %buildroot/boot
+# (Could strip out non-public symbols.)
+cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
+add_vmlinux()
+{
+    local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false
+    if test $1 == "--compressed"; then
+        compressed=true
+    fi
+    cp vmlinux %buildroot/$vmlinux
+    >%my_builddir/vmlinux.debug.files
+%if 0%{?__debug_package:1}
+    if $compressed; then
+        local vmlinux_debug=usr/lib/debug/$vmlinux.debug
+        mkdir -p $(dirname %buildroot/$vmlinux_debug)
+        /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
+    			   -l vmlinux.sourcefiles %buildroot/$vmlinux
+        # FIXME: create and package build-id symlinks
+        objcopy --only-keep-debug \
+    	    %buildroot/$vmlinux \
+    	    %buildroot/$vmlinux_debug || :
+        objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
+    	    --strip-debug \
+    	    %buildroot/$vmlinux || :
+        mkdir -p %buildroot/usr/src/debug
+        LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
+    	| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
+        find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
+        find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
+        echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
+    else
+        # make vmlinux executable so that find-debuginfo.sh picks it up
+        # (TODO: fix find-debuginfo.sh instead)
+        chmod +x %buildroot/$vmlinux
+        # exctact the provided symbols before they are stripped away
+        echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \
+            %my_builddir/$(basename $vmlinux).provides
+    fi
+%endif
+    if $compressed; then
+	gzip -9 %buildroot/$vmlinux
+        chmod a-x %buildroot/$vmlinux.gz
+    fi
+}
+%if %build_kdump
+    add_vmlinux
+    image=vmlinux
+%else
+# architecture specifics
+%ifarch %ix86 x86_64
+    add_vmlinux --compressed
+%if %build_xen
+    image=vmlinuz
+%else
+    image=bzImage
+%endif
+    cp -p arch/x86/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
+    image=vmlinuz
+%endif
+%ifarch alpha
+    add_vmlinux --compressed
+    cp -p arch/alpha/boot/vmlinux.gz %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
+    image=vmlinuz
+%endif
+%ifarch ppc ppc64
+    add_vmlinux
+    image=vmlinux
+%endif
+%ifarch ia64
+    add_vmlinux --compressed
+    mv %buildroot/boot/vmlinux-%kernelrelease-%build_flavor.gz \
+       %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
+    image=vmlinuz
+%endif
+%ifarch s390 s390x
+    add_vmlinux --compressed
+    cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
+    image=image
+    if test -e arch/s390/boot/kerntypes.o; then
+        cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
+    elif test -x "$(which dwarfextract 2>/dev/null)"; then
+	dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
+    fi
+%if %CONFIG_KMSG_IDS == "y"
+    mkdir -p %buildroot/usr/share/man/man9
+    find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
+%endif
+%endif
+# end of build_kdump
+%endif
+for sub in '-base' '' '-extra'; do
+    case "$sub" in
+    '-base' | '') base_package=1 ;;
+    *) base_package=0 ;;
+    esac
+    for script in preun postun pre post devel-pre devel-post; do
+        sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
+            -e "s:@IMAGE@:$image:g" \
+            -e "s:@FLAVOR""@:%build_flavor:g" \
+            -e "s:@SUBPACKAGE@:%name$sub:g" \
+            -e "s:@BASE_PACKAGE@:$base_package:g" \
+            -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \
+            -e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \
+	    -e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
+            -e "s:@SRCVARIANT@:%variant:g" \
+            %_sourcedir/$script.sh > %my_builddir/$script$sub.sh
+    done
+done
+%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
+# keep this -suffix list in sync with post.sh and postun.sh
+suffix=-%build_flavor
+%endif
+ln -s $image$suffix %buildroot/boot/$image$suffix
+ln -s initrd$suffix %buildroot/boot/initrd$suffix
+cp .config %buildroot/boot/config-%kernelrelease-%build_flavor
+%if %install_vdso
+# Install the unstripped vdso's that are linked in the kernel image
+make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
+%endif
+# Create a dummy initrd with roughly the size the real one will have.
+# That way, YaST will know that this package requires some additional
+# space in /boot.
+dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
+	bs=1024 seek=2047 count=1
+if [ %CONFIG_MODULES = y ]; then
+    mkdir -p %rpm_install_dir/%cpu_arch_flavor
+    mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
+    ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
+    gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
+    make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
+    if ! %_sourcedir/check-supported-list \
+	    %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
+%if %supported_modules_check
+	exit 1
+%endif
+	echo "Consistency check error: please update supported.conf."
+    fi
+%ifarch s390 s390x
+    if test -e arch/s390/boot/kerntypes.o; then
+        :
+    elif test -x "$(which dwarfextract 2>/dev/null)" -a \
+	-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then
+	find %buildroot -name "*.ko" > kofiles.list
+	dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
+    fi
+%endif
+    # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
+    # so that kernel-source + kernel-%build_flavor is sufficient for building
+    # modules that have modversions as well.
+    mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
+    cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
+    # Table of types used in exported symbols (for modversion debugging).
+    %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor
+    if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then
+	gzip -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor
+    else
+	rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor
+    fi
+    # Some architecture's $(uname -m) output is different from the ARCH
+    # parameter that needs to be passed to kbuild. Create symlinks from
+    # $(uname -m) to the ARCH directory.
+    if [ ! -e %rpm_install_dir/%_target_cpu ]; then
+	ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
+	ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+    fi
+    # We were building in %my_builddir/linux-%srcversion, but the sources will
+    # later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
+    # build symlink.
+    rm -f %buildroot/lib/modules/%kernelrelease-%build_flavor/{source,build}
+    ln -s %src_install_dir \
+	%buildroot/lib/modules/%kernelrelease-%build_flavor/source
+    ln -s %obj_install_dir/%cpu_arch/%build_flavor \
+	%buildroot/lib/modules/%kernelrelease-%build_flavor/build
+    # Abort if there are any undefined symbols
+    msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
+			-b %buildroot -ae %kernelrelease-%build_flavor 2>&1)"
+    if [ $? -ne 0 ] || echo "$msg" | grep  'needs unknown symbol'; then
+	exit 1
+    fi
+%if %split_base
+    %_sourcedir/split-modules -d %buildroot \
+	-o %my_builddir \
+	-b %kernel_build_dir/Module.base \
+	-s %kernel_build_dir/Module.supported
+%if ! %split_extra
+    cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
+%endif
+%else
+    (   cd %buildroot
+	find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
+    ) > %my_builddir/base-modules
+%endif
+    res=0
+    if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
+        # check for kabi changes
+        %_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
+            %my_builddir/kabi/%cpu_arch/symvers-%build_flavor \
+            Module.symvers || res=$?
+    fi
+    if [ $res -ne 0 ]; then
+	if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
+	     ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
+	    echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
+		 "directory to build this kernel even though its badness is" \
+		 "higher than allowed for an official kernel."
+	   exit 1
+	fi
+    fi
+    tar cf - -T %my_builddir/obj-files | \
+	tar xf - -C %rpm_install_dir/%cpu_arch_flavor
+    # bnc#507084
+    find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
+        while read f; do
+            case "$(file -b "$f")" in
+            ELF\ *\ executable*)
+                strip "$f"
+            esac
+        done
+    # Replace the absolute with a relative path
+    sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
+	%rpm_install_dir/%cpu_arch_flavor/Makefile
+fi
+add_dirs_to_filelist() {
+    sed -rn '
+        # print file name
+        p
+        # remove filelist macros
+        s:%%[a-z]+(\([^)]+\))? ?::g
+        # add %%dir prefix
+        s:^:%%dir :
+        # print all parents
+        :a
+            # skip directories owned by other packages
+            s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
+            s:/[^/]+$::p
+        ta
+    ' "$@" | sort -u
+}
+# Collect the file lists.
+shopt -s nullglob
+> %my_builddir/kernel-devel.files
+for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
+				%buildroot/lib/modules/*/{build,source}; do
+	f=${file##%buildroot}
+	echo "$f" >> %my_builddir/kernel-devel.files
+done
+{   cd %buildroot
+    find boot \
+	\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
+	-type f -name 'vmlinux-*.provides' -prune -o \
+	-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
+        -type f -printf '/%%p\n'
+    # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
+    # the file gets removed when uninstalling the kernel.
+    echo '%%ghost /boot/initrd-%kernelrelease-kdump'
+    touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
+    if [ %CONFIG_MODULES = y ]; then
+	find lib/modules/%kernelrelease-%build_flavor \
+	    -type d -o \
+	    \( -path '*/modules.*' ! -path '*/modules.order' \
+	     ! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
+	       -o -name '*.ko' -prune -o -printf '/%%p\n'
+	cat %my_builddir/base-modules
+    fi
+    test -d lib/firmware/%kernelrelease-%build_flavor && \
+    find lib/firmware/%kernelrelease-%build_flavor \
+	-type d -o \
+	-printf '/%%p\n'
+    if [ -e .%_docdir/%name ]; then
+	echo "%%doc %_docdir/%name"
+    fi
+} | sort -u >%my_builddir/tmp
+cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
+    add_dirs_to_filelist >%my_builddir/kernel-base.files
+rm %my_builddir/tmp
+%if %split_base
+    add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
+	> %my_builddir/kernel-main.files
+%endif
+%if %split_extra
+    add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
+%endif
+# Hardlink duplicate files automatically (from package fdupes): It doesn't save
+# much, but it keeps rpmlint from breaking the package build.
+%fdupes $RPM_BUILD_ROOT
+
+%preun -f preun.sh
+
+%postun -f postun.sh
+
+%pre -f pre.sh
+
+%post -f post.sh
+%if %split_base
+
+%files -f kernel-main.files
+%else
+
+%files -f kernel-base.files
+%endif
+%defattr(-, root, root)
+
+%package base
+Summary:        The Amazon EC2 Xen Kernel - base modules
+License:        GPLv2
+Group:          System/Kernel
+Url:            http://www.kernel.org/
+AutoReqProv:    on
+Provides:       multiversion(kernel)
+Provides:       kernel-base = %version-%source_rel
+Requires(pre):  coreutils awk
+Requires(post): module-init-tools
+Requires(post): perl-Bootloader
+Requires(post): mkinitrd
+%ifarch %ix86
+Conflicts:      libc.so.6()(64bit)
+%endif
+
+%description base
+The Linux kernel for Xen paravirtualization.
+
+This kernel can only be used both as an unprivileged ("xenU")
+kernel (for Amazon EC2).
+
+This package contains only the base modules, required in all installs.
+
+
+%source_timestamp
+%preun base -f preun-base.sh
+
+%postun base -f postun-base.sh
+
+%pre base -f pre-base.sh
+
+%post base -f post-base.sh
+%if %split_base
+
+%files base -f kernel-base.files
+%defattr(-, root, root)
+%endif
+
+%package extra
+Summary:        The Amazon EC2 Xen Kernel - Unsupported kernel modules
+License:        GPLv2
+Group:          System/Kernel
+Url:            http://www.kernel.org/
+AutoReqProv:    on
+Provides:       multiversion(kernel)
+Provides:       %name-extra_%_target_cpu = %version-%release
+Provides:       kernel-extra = %version-%source_rel
+Requires:       %{name}_%_target_cpu = %version-%release
+Requires(pre):  coreutils awk
+Requires(post): module-init-tools
+Requires(post): perl-Bootloader
+Requires(post): mkinitrd
+Supplements:    packageand(product(SUSE_SLED):%{name}_%_target_cpu)
+%ifarch %ix86
+Conflicts:      libc.so.6()(64bit)
+%endif
+
+%description extra
+The Linux kernel for Xen paravirtualization.
+
+This kernel can only be used both as an unprivileged ("xenU")
+kernel (for Amazon EC2).
+
+This package contains additional modules not supported by Novell.
+
+
+%source_timestamp
+%preun extra -f preun-extra.sh
+
+%postun extra -f postun-extra.sh
+
+%pre extra -f pre-extra.sh
+
+%post extra -f post-extra.sh
+%if %split_extra
+
+%files extra -f kernel-extra.files
+%defattr(-, root, root)
+%endif
+%if %CONFIG_KMSG_IDS == "y"
+
+%package man
+Summary:        The collection of man pages generated by the kmsg script.
+License:        GPLv2
+Group:          System/Kernel
+
+%description man
+This package includes the man pages that have been generated from the
+kmsg message documentation comments.
+
+
+%source_timestamp
+%files man
+%defattr(-,root,root)
+/usr/share/man/man9/*
+%endif
+
+%package devel
+Summary:        Development files necessary for building kernel modules
+License:        GPLv2
+Group:          Development/Sources
+Provides:       multiversion(kernel)
+Provides:       %name-devel = %version-%source_rel
+Requires:       kernel-source%variant = %version-%source_rel
+Supplements:    packageand(%name:kernel-source)
+AutoReqProv:    on
+
+%description devel
+This package contains files necessary for building kernel modules (and
+kernel module packages) against the %build_flavor flavor of the kernel.
+
+
+%source_timestamp
+%if %CONFIG_MODULES == "y"
+
+%pre devel -f devel-pre.sh
+
+%post devel -f devel-post.sh
+
+%files devel -f kernel-devel.files
+%defattr(-,root,root)
+%dir %obj_install_dir
+%dir %obj_install_dir/%cpu_arch
+%dir /usr/src/linux-obj
+%dir /usr/src/linux-obj/%cpu_arch
+%ghost /usr/src/linux-obj/%cpu_arch_flavor
+%obj_install_dir/%cpu_arch_flavor
+%if %_target_cpu != %cpu_arch
+%obj_install_dir/%_target_cpu
+/usr/src/linux-obj/%_target_cpu
+%endif
+%endif
+
+%package devel-debuginfo
+# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
+Summary:        Debug information for package %name-devel
+License:        GPLv2
+Group:          Development/Debug
+
+%description devel-debuginfo
+Debug information for package %name-devel
+
+
+%source_timestamp
+%files devel-debuginfo -f vmlinux.debug.files
+
+%changelog

kernel-pae.changes

@@ -1,3 +1,138 @@
+-------------------------------------------------------------------
+Thu Feb  4 13:23:57 CET 2010 - knikanth@suse.de
+
+- patches.fixes/dm-stripe-zero-stripes: dm-stripe: return -EINVAL
+  if stripe count is zero (bnc#576312).
+
+-------------------------------------------------------------------
+Thu Feb  4 12:17:25 CET 2010 - npiggin@suse.de
+
+- Disable patches.suse/files-slab-rcu.patch.
+
+-------------------------------------------------------------------
+Thu Feb  4 09:46:35 CET 2010 - tiwai@suse.de
+
+- supported.conf: mark snd-wss-lib unsupported
+
+-------------------------------------------------------------------
+Thu Feb  4 09:45:34 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2:
+  ALSA: hda - Adding support for another IDT 92HD83XXX codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Wed Feb  3 19:17:01 CET 2010 - jbohac@suse.cz
+
+- supported.conf: marked em_cmp supported (bnc#568130)
+
+-------------------------------------------------------------------
+Wed Feb  3 14:57:19 CET 2010 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: automatically install a matching
+  -devel package if kernel-source is installed.
+
+-------------------------------------------------------------------
+Wed Feb  3 13:06:15 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc6 and c/s 989.
+- patches.xen/xen-netback-generalize: Netback: Generalize
+  static/global variables into 'struct xen_netbk'.
+- patches.xen/xen-netback-kernel-threads: Use Kernel thread to
+  replace the tasklet.
+- patches.xen/xen-netback-multiple-tasklets: Netback:
+  Multiple tasklets support.
+
+-------------------------------------------------------------------
+Tue Feb  2 15:59:38 CET 2010 - jkosina@suse.cz
+
+- patches.suse/suse-ppc64-branding: the message about crashed kernel
+  doesn't make sense any more with CONFIG_CRASH_DUMP enabled by
+  default (bnc#575884).
+
+-------------------------------------------------------------------
+Sat Jan 30 21:51:35 CET 2010 - jeffm@suse.com
+
+- Update to 2.6.33-rc6.
+  - Eliminated 12 patches.
+
+-------------------------------------------------------------------
+Sat Jan 30 21:30:27 CET 2010 - jeffm@suse.com
+
+- patches.rpmify/hugetlbfs-fix-section-mismatches: Removed __init
+  from hugetlb_sysfs_add_hstate instead of adding it elsewhere.
+
+-------------------------------------------------------------------
+Sat Jan 30 09:05:13 CET 2010 - jslaby@suse.de
+
+- patches.suse/kdb-common: Fix hid crash (bnc#570591)
+
+-------------------------------------------------------------------
+Fri Jan 29 12:11:55 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support: ALSA:
+  hda - Add support for IDT 92HD88 family codecs (bnc#569354).
+
+-------------------------------------------------------------------
+Fri Jan 29 11:14:39 CET 2010 - jkosina@suse.cz
+
+- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch:
+  Update patch-mainline tag.
+
+-------------------------------------------------------------------
+Fri Jan 29 10:39:59 CET 2010 - jbenc@suse.cz
+
+- Update config files: fixed vanilla configs.
+
+-------------------------------------------------------------------
+Thu Jan 28 19:27:54 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led: ALSA:
+  hda - Add mute LED check for HP laptops with IDT 92HD83xxx codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Thu Jan 28 16:56:02 CET 2010 - jbeulich@novell.com
+
+- patches.suse/supported-flag: Fix -ec2 build.
+- patches.suse/supported-flag-enterprise: Refresh.
+- patches.xen/xen3-patch-2.6.33-rc3: Fix ia64 build.
+
+-------------------------------------------------------------------
+Thu Jan 28 16:28:01 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc5 and c/s 987.
+- config.conf: Re-enable Xen.
+- Update config files.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:50:18 CET 2010 - jbenc@suse.cz
+
+- Update config files: enabled CONFIG_CFG80211_WEXT to keep backward
+  user space compatibility and enabled few wireless drivers.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:37:22 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: Add support for an additional series file in
+  patches.addon/series, this will be applied after the main series.
+
+-------------------------------------------------------------------
+Thu Jan 28 11:17:01 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: put the patch loops from kernel-binary.spec.in
+  and kernel-source.spec.in to one place.
+
+-------------------------------------------------------------------
+Wed Jan 27 20:24:43 CET 2010 - jeffm@suse.de
+
+- Deleted 28 unused patches.
+
+-------------------------------------------------------------------
+Wed Jan 27 15:56:48 CET 2010 - jeffm@suse.com
+
+- Update config files.
+
 -------------------------------------------------------------------
 Wed Jan 27 14:55:29 CET 2010 - jkosina@suse.cz
 

kernel-pae.spec

@@ -18,7 +18,7 @@
 # norootforbuild
 
 %define srcversion 2.6.32
-%define patchversion 2.6.33-rc5
+%define patchversion 2.6.33-rc6
 %define variant %{nil}
 %include %_sourcedir/kernel-spec-macros
 %define build_flavor	pae
@@ -31,7 +31,7 @@
 %define obj_install_dir %src_install_dir-obj
 %define rpm_install_dir %buildroot%obj_install_dir
 %define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
 %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
 %define cpu_arch_flavor %cpu_arch/%build_flavor
 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
@@ -49,7 +49,7 @@
 Name:           kernel-pae
 Summary:        Kernel with PAE Support
 Version:        2.6.33
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif
@@ -235,15 +235,11 @@ supported_conf() {
 } > %kernel_build_dir/Module.supported
 supported_conf --default=0 base >%kernel_build_dir/Module.base
 cd linux-%srcversion
-# Apply patches
+%_sourcedir/apply-patches \
-echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
+%if %{build_vanilla}
-%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
+	--vanilla \
-%if %build_vanilla
-    egrep '^patches\.(kernel\.org|rpmify)/' | \
 %endif
-    sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \
+	%_sourcedir/series.conf .. $SYMBOLS
-    >>../apply-patches.sh
-bash -ex ../apply-patches.sh
 cd %kernel_build_dir
 if [ -f %_sourcedir/localversion ] ; then
     cat %_sourcedir/localversion > localversion
@@ -741,6 +737,7 @@ Group:          Development/Sources
 Provides:       multiversion(kernel)
 Provides:       %name-devel = %version-%source_rel
 Requires:       kernel-source%variant = %version-%source_rel
+Supplements:    packageand(%name:kernel-source)
 AutoReqProv:    on
 
 %description devel

kernel-ppc64.changes

@@ -1,3 +1,138 @@
+-------------------------------------------------------------------
+Thu Feb  4 13:23:57 CET 2010 - knikanth@suse.de
+
+- patches.fixes/dm-stripe-zero-stripes: dm-stripe: return -EINVAL
+  if stripe count is zero (bnc#576312).
+
+-------------------------------------------------------------------
+Thu Feb  4 12:17:25 CET 2010 - npiggin@suse.de
+
+- Disable patches.suse/files-slab-rcu.patch.
+
+-------------------------------------------------------------------
+Thu Feb  4 09:46:35 CET 2010 - tiwai@suse.de
+
+- supported.conf: mark snd-wss-lib unsupported
+
+-------------------------------------------------------------------
+Thu Feb  4 09:45:34 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2:
+  ALSA: hda - Adding support for another IDT 92HD83XXX codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Wed Feb  3 19:17:01 CET 2010 - jbohac@suse.cz
+
+- supported.conf: marked em_cmp supported (bnc#568130)
+
+-------------------------------------------------------------------
+Wed Feb  3 14:57:19 CET 2010 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: automatically install a matching
+  -devel package if kernel-source is installed.
+
+-------------------------------------------------------------------
+Wed Feb  3 13:06:15 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc6 and c/s 989.
+- patches.xen/xen-netback-generalize: Netback: Generalize
+  static/global variables into 'struct xen_netbk'.
+- patches.xen/xen-netback-kernel-threads: Use Kernel thread to
+  replace the tasklet.
+- patches.xen/xen-netback-multiple-tasklets: Netback:
+  Multiple tasklets support.
+
+-------------------------------------------------------------------
+Tue Feb  2 15:59:38 CET 2010 - jkosina@suse.cz
+
+- patches.suse/suse-ppc64-branding: the message about crashed kernel
+  doesn't make sense any more with CONFIG_CRASH_DUMP enabled by
+  default (bnc#575884).
+
+-------------------------------------------------------------------
+Sat Jan 30 21:51:35 CET 2010 - jeffm@suse.com
+
+- Update to 2.6.33-rc6.
+  - Eliminated 12 patches.
+
+-------------------------------------------------------------------
+Sat Jan 30 21:30:27 CET 2010 - jeffm@suse.com
+
+- patches.rpmify/hugetlbfs-fix-section-mismatches: Removed __init
+  from hugetlb_sysfs_add_hstate instead of adding it elsewhere.
+
+-------------------------------------------------------------------
+Sat Jan 30 09:05:13 CET 2010 - jslaby@suse.de
+
+- patches.suse/kdb-common: Fix hid crash (bnc#570591)
+
+-------------------------------------------------------------------
+Fri Jan 29 12:11:55 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support: ALSA:
+  hda - Add support for IDT 92HD88 family codecs (bnc#569354).
+
+-------------------------------------------------------------------
+Fri Jan 29 11:14:39 CET 2010 - jkosina@suse.cz
+
+- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch:
+  Update patch-mainline tag.
+
+-------------------------------------------------------------------
+Fri Jan 29 10:39:59 CET 2010 - jbenc@suse.cz
+
+- Update config files: fixed vanilla configs.
+
+-------------------------------------------------------------------
+Thu Jan 28 19:27:54 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led: ALSA:
+  hda - Add mute LED check for HP laptops with IDT 92HD83xxx codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Thu Jan 28 16:56:02 CET 2010 - jbeulich@novell.com
+
+- patches.suse/supported-flag: Fix -ec2 build.
+- patches.suse/supported-flag-enterprise: Refresh.
+- patches.xen/xen3-patch-2.6.33-rc3: Fix ia64 build.
+
+-------------------------------------------------------------------
+Thu Jan 28 16:28:01 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc5 and c/s 987.
+- config.conf: Re-enable Xen.
+- Update config files.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:50:18 CET 2010 - jbenc@suse.cz
+
+- Update config files: enabled CONFIG_CFG80211_WEXT to keep backward
+  user space compatibility and enabled few wireless drivers.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:37:22 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: Add support for an additional series file in
+  patches.addon/series, this will be applied after the main series.
+
+-------------------------------------------------------------------
+Thu Jan 28 11:17:01 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: put the patch loops from kernel-binary.spec.in
+  and kernel-source.spec.in to one place.
+
+-------------------------------------------------------------------
+Wed Jan 27 20:24:43 CET 2010 - jeffm@suse.de
+
+- Deleted 28 unused patches.
+
+-------------------------------------------------------------------
+Wed Jan 27 15:56:48 CET 2010 - jeffm@suse.com
+
+- Update config files.
+
 -------------------------------------------------------------------
 Wed Jan 27 14:55:29 CET 2010 - jkosina@suse.cz
 

kernel-ppc64.spec

@@ -18,7 +18,7 @@
 # norootforbuild
 
 %define srcversion 2.6.32
-%define patchversion 2.6.33-rc5
+%define patchversion 2.6.33-rc6
 %define variant %{nil}
 %include %_sourcedir/kernel-spec-macros
 %define build_flavor	ppc64
@@ -31,7 +31,7 @@
 %define obj_install_dir %src_install_dir-obj
 %define rpm_install_dir %buildroot%obj_install_dir
 %define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
 %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
 %define cpu_arch_flavor %cpu_arch/%build_flavor
 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
@@ -49,7 +49,7 @@
 Name:           kernel-ppc64
 Summary:        Kernel for ppc64 Systems
 Version:        2.6.33
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif
@@ -239,15 +239,11 @@ supported_conf() {
 } > %kernel_build_dir/Module.supported
 supported_conf --default=0 base >%kernel_build_dir/Module.base
 cd linux-%srcversion
-# Apply patches
+%_sourcedir/apply-patches \
-echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
+%if %{build_vanilla}
-%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
+	--vanilla \
-%if %build_vanilla
-    egrep '^patches\.(kernel\.org|rpmify)/' | \
 %endif
-    sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \
+	%_sourcedir/series.conf .. $SYMBOLS
-    >>../apply-patches.sh
-bash -ex ../apply-patches.sh
 cd %kernel_build_dir
 if [ -f %_sourcedir/localversion ] ; then
     cat %_sourcedir/localversion > localversion
@@ -745,6 +741,7 @@ Group:          Development/Sources
 Provides:       multiversion(kernel)
 Provides:       %name-devel = %version-%source_rel
 Requires:       kernel-source%variant = %version-%source_rel
+Supplements:    packageand(%name:kernel-source)
 AutoReqProv:    on
 
 %description devel

kernel-ps3.changes

@@ -1,3 +1,138 @@
+-------------------------------------------------------------------
+Thu Feb  4 13:23:57 CET 2010 - knikanth@suse.de
+
+- patches.fixes/dm-stripe-zero-stripes: dm-stripe: return -EINVAL
+  if stripe count is zero (bnc#576312).
+
+-------------------------------------------------------------------
+Thu Feb  4 12:17:25 CET 2010 - npiggin@suse.de
+
+- Disable patches.suse/files-slab-rcu.patch.
+
+-------------------------------------------------------------------
+Thu Feb  4 09:46:35 CET 2010 - tiwai@suse.de
+
+- supported.conf: mark snd-wss-lib unsupported
+
+-------------------------------------------------------------------
+Thu Feb  4 09:45:34 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2:
+  ALSA: hda - Adding support for another IDT 92HD83XXX codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Wed Feb  3 19:17:01 CET 2010 - jbohac@suse.cz
+
+- supported.conf: marked em_cmp supported (bnc#568130)
+
+-------------------------------------------------------------------
+Wed Feb  3 14:57:19 CET 2010 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: automatically install a matching
+  -devel package if kernel-source is installed.
+
+-------------------------------------------------------------------
+Wed Feb  3 13:06:15 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc6 and c/s 989.
+- patches.xen/xen-netback-generalize: Netback: Generalize
+  static/global variables into 'struct xen_netbk'.
+- patches.xen/xen-netback-kernel-threads: Use Kernel thread to
+  replace the tasklet.
+- patches.xen/xen-netback-multiple-tasklets: Netback:
+  Multiple tasklets support.
+
+-------------------------------------------------------------------
+Tue Feb  2 15:59:38 CET 2010 - jkosina@suse.cz
+
+- patches.suse/suse-ppc64-branding: the message about crashed kernel
+  doesn't make sense any more with CONFIG_CRASH_DUMP enabled by
+  default (bnc#575884).
+
+-------------------------------------------------------------------
+Sat Jan 30 21:51:35 CET 2010 - jeffm@suse.com
+
+- Update to 2.6.33-rc6.
+  - Eliminated 12 patches.
+
+-------------------------------------------------------------------
+Sat Jan 30 21:30:27 CET 2010 - jeffm@suse.com
+
+- patches.rpmify/hugetlbfs-fix-section-mismatches: Removed __init
+  from hugetlb_sysfs_add_hstate instead of adding it elsewhere.
+
+-------------------------------------------------------------------
+Sat Jan 30 09:05:13 CET 2010 - jslaby@suse.de
+
+- patches.suse/kdb-common: Fix hid crash (bnc#570591)
+
+-------------------------------------------------------------------
+Fri Jan 29 12:11:55 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support: ALSA:
+  hda - Add support for IDT 92HD88 family codecs (bnc#569354).
+
+-------------------------------------------------------------------
+Fri Jan 29 11:14:39 CET 2010 - jkosina@suse.cz
+
+- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch:
+  Update patch-mainline tag.
+
+-------------------------------------------------------------------
+Fri Jan 29 10:39:59 CET 2010 - jbenc@suse.cz
+
+- Update config files: fixed vanilla configs.
+
+-------------------------------------------------------------------
+Thu Jan 28 19:27:54 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led: ALSA:
+  hda - Add mute LED check for HP laptops with IDT 92HD83xxx codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Thu Jan 28 16:56:02 CET 2010 - jbeulich@novell.com
+
+- patches.suse/supported-flag: Fix -ec2 build.
+- patches.suse/supported-flag-enterprise: Refresh.
+- patches.xen/xen3-patch-2.6.33-rc3: Fix ia64 build.
+
+-------------------------------------------------------------------
+Thu Jan 28 16:28:01 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc5 and c/s 987.
+- config.conf: Re-enable Xen.
+- Update config files.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:50:18 CET 2010 - jbenc@suse.cz
+
+- Update config files: enabled CONFIG_CFG80211_WEXT to keep backward
+  user space compatibility and enabled few wireless drivers.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:37:22 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: Add support for an additional series file in
+  patches.addon/series, this will be applied after the main series.
+
+-------------------------------------------------------------------
+Thu Jan 28 11:17:01 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: put the patch loops from kernel-binary.spec.in
+  and kernel-source.spec.in to one place.
+
+-------------------------------------------------------------------
+Wed Jan 27 20:24:43 CET 2010 - jeffm@suse.de
+
+- Deleted 28 unused patches.
+
+-------------------------------------------------------------------
+Wed Jan 27 15:56:48 CET 2010 - jeffm@suse.com
+
+- Update config files.
+
 -------------------------------------------------------------------
 Wed Jan 27 14:55:29 CET 2010 - jkosina@suse.cz
 

kernel-ps3.spec

@@ -18,7 +18,7 @@
 # norootforbuild
 
 %define srcversion 2.6.32
-%define patchversion 2.6.33-rc5
+%define patchversion 2.6.33-rc6
 %define variant %{nil}
 %include %_sourcedir/kernel-spec-macros
 %define build_flavor	ps3
@@ -31,7 +31,7 @@
 %define obj_install_dir %src_install_dir-obj
 %define rpm_install_dir %buildroot%obj_install_dir
 %define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
 %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
 %define cpu_arch_flavor %cpu_arch/%build_flavor
 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
@@ -49,7 +49,7 @@
 Name:           kernel-ps3
 Summary:        kernel for ps3 bootloader
 Version:        2.6.33
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif
@@ -227,15 +227,11 @@ supported_conf() {
 } > %kernel_build_dir/Module.supported
 supported_conf --default=0 base >%kernel_build_dir/Module.base
 cd linux-%srcversion
-# Apply patches
+%_sourcedir/apply-patches \
-echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
+%if %{build_vanilla}
-%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
+	--vanilla \
-%if %build_vanilla
-    egrep '^patches\.(kernel\.org|rpmify)/' | \
 %endif
-    sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \
+	%_sourcedir/series.conf .. $SYMBOLS
-    >>../apply-patches.sh
-bash -ex ../apply-patches.sh
 cd %kernel_build_dir
 if [ -f %_sourcedir/localversion ] ; then
     cat %_sourcedir/localversion > localversion
@@ -725,6 +721,7 @@ Group:          Development/Sources
 Provides:       multiversion(kernel)
 Provides:       %name-devel = %version-%source_rel
 Requires:       kernel-source%variant = %version-%source_rel
+Supplements:    packageand(%name:kernel-source)
 AutoReqProv:    on
 
 %description devel

kernel-s390.changes

@@ -1,3 +1,138 @@
+-------------------------------------------------------------------
+Thu Feb  4 13:23:57 CET 2010 - knikanth@suse.de
+
+- patches.fixes/dm-stripe-zero-stripes: dm-stripe: return -EINVAL
+  if stripe count is zero (bnc#576312).
+
+-------------------------------------------------------------------
+Thu Feb  4 12:17:25 CET 2010 - npiggin@suse.de
+
+- Disable patches.suse/files-slab-rcu.patch.
+
+-------------------------------------------------------------------
+Thu Feb  4 09:46:35 CET 2010 - tiwai@suse.de
+
+- supported.conf: mark snd-wss-lib unsupported
+
+-------------------------------------------------------------------
+Thu Feb  4 09:45:34 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2:
+  ALSA: hda - Adding support for another IDT 92HD83XXX codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Wed Feb  3 19:17:01 CET 2010 - jbohac@suse.cz
+
+- supported.conf: marked em_cmp supported (bnc#568130)
+
+-------------------------------------------------------------------
+Wed Feb  3 14:57:19 CET 2010 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: automatically install a matching
+  -devel package if kernel-source is installed.
+
+-------------------------------------------------------------------
+Wed Feb  3 13:06:15 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc6 and c/s 989.
+- patches.xen/xen-netback-generalize: Netback: Generalize
+  static/global variables into 'struct xen_netbk'.
+- patches.xen/xen-netback-kernel-threads: Use Kernel thread to
+  replace the tasklet.
+- patches.xen/xen-netback-multiple-tasklets: Netback:
+  Multiple tasklets support.
+
+-------------------------------------------------------------------
+Tue Feb  2 15:59:38 CET 2010 - jkosina@suse.cz
+
+- patches.suse/suse-ppc64-branding: the message about crashed kernel
+  doesn't make sense any more with CONFIG_CRASH_DUMP enabled by
+  default (bnc#575884).
+
+-------------------------------------------------------------------
+Sat Jan 30 21:51:35 CET 2010 - jeffm@suse.com
+
+- Update to 2.6.33-rc6.
+  - Eliminated 12 patches.
+
+-------------------------------------------------------------------
+Sat Jan 30 21:30:27 CET 2010 - jeffm@suse.com
+
+- patches.rpmify/hugetlbfs-fix-section-mismatches: Removed __init
+  from hugetlb_sysfs_add_hstate instead of adding it elsewhere.
+
+-------------------------------------------------------------------
+Sat Jan 30 09:05:13 CET 2010 - jslaby@suse.de
+
+- patches.suse/kdb-common: Fix hid crash (bnc#570591)
+
+-------------------------------------------------------------------
+Fri Jan 29 12:11:55 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support: ALSA:
+  hda - Add support for IDT 92HD88 family codecs (bnc#569354).
+
+-------------------------------------------------------------------
+Fri Jan 29 11:14:39 CET 2010 - jkosina@suse.cz
+
+- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch:
+  Update patch-mainline tag.
+
+-------------------------------------------------------------------
+Fri Jan 29 10:39:59 CET 2010 - jbenc@suse.cz
+
+- Update config files: fixed vanilla configs.
+
+-------------------------------------------------------------------
+Thu Jan 28 19:27:54 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led: ALSA:
+  hda - Add mute LED check for HP laptops with IDT 92HD83xxx codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Thu Jan 28 16:56:02 CET 2010 - jbeulich@novell.com
+
+- patches.suse/supported-flag: Fix -ec2 build.
+- patches.suse/supported-flag-enterprise: Refresh.
+- patches.xen/xen3-patch-2.6.33-rc3: Fix ia64 build.
+
+-------------------------------------------------------------------
+Thu Jan 28 16:28:01 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc5 and c/s 987.
+- config.conf: Re-enable Xen.
+- Update config files.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:50:18 CET 2010 - jbenc@suse.cz
+
+- Update config files: enabled CONFIG_CFG80211_WEXT to keep backward
+  user space compatibility and enabled few wireless drivers.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:37:22 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: Add support for an additional series file in
+  patches.addon/series, this will be applied after the main series.
+
+-------------------------------------------------------------------
+Thu Jan 28 11:17:01 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: put the patch loops from kernel-binary.spec.in
+  and kernel-source.spec.in to one place.
+
+-------------------------------------------------------------------
+Wed Jan 27 20:24:43 CET 2010 - jeffm@suse.de
+
+- Deleted 28 unused patches.
+
+-------------------------------------------------------------------
+Wed Jan 27 15:56:48 CET 2010 - jeffm@suse.com
+
+- Update config files.
+
 -------------------------------------------------------------------
 Wed Jan 27 14:55:29 CET 2010 - jkosina@suse.cz
 

kernel-s390.spec

@@ -18,7 +18,7 @@
 # norootforbuild
 
 %define srcversion 2.6.32
-%define patchversion 2.6.33-rc5
+%define patchversion 2.6.33-rc6
 %define variant %{nil}
 %include %_sourcedir/kernel-spec-macros
 %define build_flavor	s390
@@ -31,7 +31,7 @@
 %define obj_install_dir %src_install_dir-obj
 %define rpm_install_dir %buildroot%obj_install_dir
 %define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
 %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
 %define cpu_arch_flavor %cpu_arch/%build_flavor
 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
@@ -49,7 +49,7 @@
 Name:           kernel-s390
 Summary:        The Standard Kernel
 Version:        2.6.33
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif
@@ -228,15 +228,11 @@ supported_conf() {
 } > %kernel_build_dir/Module.supported
 supported_conf --default=0 base >%kernel_build_dir/Module.base
 cd linux-%srcversion
-# Apply patches
+%_sourcedir/apply-patches \
-echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
+%if %{build_vanilla}
-%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
+	--vanilla \
-%if %build_vanilla
-    egrep '^patches\.(kernel\.org|rpmify)/' | \
 %endif
-    sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \
+	%_sourcedir/series.conf .. $SYMBOLS
-    >>../apply-patches.sh
-bash -ex ../apply-patches.sh
 cd %kernel_build_dir
 if [ -f %_sourcedir/localversion ] ; then
     cat %_sourcedir/localversion > localversion
@@ -720,6 +716,7 @@ Group:          Development/Sources
 Provides:       multiversion(kernel)
 Provides:       %name-devel = %version-%source_rel
 Requires:       kernel-source%variant = %version-%source_rel
+Supplements:    packageand(%name:kernel-source)
 AutoReqProv:    on
 
 %description devel

kernel-source.changes

@@ -1,3 +1,138 @@
+-------------------------------------------------------------------
+Thu Feb  4 13:23:57 CET 2010 - knikanth@suse.de
+
+- patches.fixes/dm-stripe-zero-stripes: dm-stripe: return -EINVAL
+  if stripe count is zero (bnc#576312).
+
+-------------------------------------------------------------------
+Thu Feb  4 12:17:25 CET 2010 - npiggin@suse.de
+
+- Disable patches.suse/files-slab-rcu.patch.
+
+-------------------------------------------------------------------
+Thu Feb  4 09:46:35 CET 2010 - tiwai@suse.de
+
+- supported.conf: mark snd-wss-lib unsupported
+
+-------------------------------------------------------------------
+Thu Feb  4 09:45:34 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2:
+  ALSA: hda - Adding support for another IDT 92HD83XXX codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Wed Feb  3 19:17:01 CET 2010 - jbohac@suse.cz
+
+- supported.conf: marked em_cmp supported (bnc#568130)
+
+-------------------------------------------------------------------
+Wed Feb  3 14:57:19 CET 2010 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: automatically install a matching
+  -devel package if kernel-source is installed.
+
+-------------------------------------------------------------------
+Wed Feb  3 13:06:15 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc6 and c/s 989.
+- patches.xen/xen-netback-generalize: Netback: Generalize
+  static/global variables into 'struct xen_netbk'.
+- patches.xen/xen-netback-kernel-threads: Use Kernel thread to
+  replace the tasklet.
+- patches.xen/xen-netback-multiple-tasklets: Netback:
+  Multiple tasklets support.
+
+-------------------------------------------------------------------
+Tue Feb  2 15:59:38 CET 2010 - jkosina@suse.cz
+
+- patches.suse/suse-ppc64-branding: the message about crashed kernel
+  doesn't make sense any more with CONFIG_CRASH_DUMP enabled by
+  default (bnc#575884).
+
+-------------------------------------------------------------------
+Sat Jan 30 21:51:35 CET 2010 - jeffm@suse.com
+
+- Update to 2.6.33-rc6.
+  - Eliminated 12 patches.
+
+-------------------------------------------------------------------
+Sat Jan 30 21:30:27 CET 2010 - jeffm@suse.com
+
+- patches.rpmify/hugetlbfs-fix-section-mismatches: Removed __init
+  from hugetlb_sysfs_add_hstate instead of adding it elsewhere.
+
+-------------------------------------------------------------------
+Sat Jan 30 09:05:13 CET 2010 - jslaby@suse.de
+
+- patches.suse/kdb-common: Fix hid crash (bnc#570591)
+
+-------------------------------------------------------------------
+Fri Jan 29 12:11:55 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support: ALSA:
+  hda - Add support for IDT 92HD88 family codecs (bnc#569354).
+
+-------------------------------------------------------------------
+Fri Jan 29 11:14:39 CET 2010 - jkosina@suse.cz
+
+- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch:
+  Update patch-mainline tag.
+
+-------------------------------------------------------------------
+Fri Jan 29 10:39:59 CET 2010 - jbenc@suse.cz
+
+- Update config files: fixed vanilla configs.
+
+-------------------------------------------------------------------
+Thu Jan 28 19:27:54 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led: ALSA:
+  hda - Add mute LED check for HP laptops with IDT 92HD83xxx codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Thu Jan 28 16:56:02 CET 2010 - jbeulich@novell.com
+
+- patches.suse/supported-flag: Fix -ec2 build.
+- patches.suse/supported-flag-enterprise: Refresh.
+- patches.xen/xen3-patch-2.6.33-rc3: Fix ia64 build.
+
+-------------------------------------------------------------------
+Thu Jan 28 16:28:01 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc5 and c/s 987.
+- config.conf: Re-enable Xen.
+- Update config files.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:50:18 CET 2010 - jbenc@suse.cz
+
+- Update config files: enabled CONFIG_CFG80211_WEXT to keep backward
+  user space compatibility and enabled few wireless drivers.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:37:22 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: Add support for an additional series file in
+  patches.addon/series, this will be applied after the main series.
+
+-------------------------------------------------------------------
+Thu Jan 28 11:17:01 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: put the patch loops from kernel-binary.spec.in
+  and kernel-source.spec.in to one place.
+
+-------------------------------------------------------------------
+Wed Jan 27 20:24:43 CET 2010 - jeffm@suse.de
+
+- Deleted 28 unused patches.
+
+-------------------------------------------------------------------
+Wed Jan 27 15:56:48 CET 2010 - jeffm@suse.com
+
+- Update config files.
+
 -------------------------------------------------------------------
 Wed Jan 27 14:55:29 CET 2010 - jkosina@suse.cz
 

kernel-source.spec

@@ -19,7 +19,7 @@
 # icecream 0
 
 %define srcversion 2.6.32
-%define patchversion 2.6.33-rc5
+%define patchversion 2.6.33-rc6
 %define variant %{nil}
 %include %_sourcedir/kernel-spec-macros
 %define src_install_dir usr/src/linux-%kernelrelease%variant
@@ -29,7 +29,7 @@
 Name:           kernel-source
 Summary:        The Linux Kernel Sources
 Version:        2.6.33
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif
@@ -54,6 +54,7 @@ Source12:       pre.sh
 Source13:       post.sh
 Source14:       series.conf
 Source16:       guards
+Source17:       apply-patches
 Source21:       config.conf
 Source23:       supported.conf
 Source33:       check-for-config-changes
@@ -97,7 +98,7 @@ Source120:      kabi.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 Prefix:         /usr/src
-%(chmod +x %_sourcedir/{guards,check-for-config-changes,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols})
+%(chmod +x %_sourcedir/{apply-patches,guards,check-for-config-changes,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols})
 %define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
 %define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac)
 %define do_vanilla "%variant" == ""
@@ -140,23 +141,15 @@ ln -sf linux%variant linux%variant  # dummy symlink
 # Unpack the vanilla kernel sources
 tar xjf %_sourcedir/linux-%srcversion.tar.bz2
 mv linux-%srcversion linux-%kernelrelease%variant
-# generate script to apply patches
-echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" \
-    >%my_builddir/apply-patches.sh
-%_sourcedir/guards %symbols <%_sourcedir/series.conf | \
-    sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i %my_builddir/:' \
-    >>%my_builddir/apply-patches.sh
 %if %do_vanilla
-egrep '^trap|patches\.(kernel\.org|rpmify)/' %my_builddir/apply-patches.sh \
-    >%my_builddir/apply-patches-vanilla.sh
 cp -al linux-%kernelrelease%variant linux-%kernelrelease-vanilla
 cd linux-%kernelrelease-vanilla
-bash -ex %my_builddir/apply-patches-vanilla.sh
+%_sourcedir/apply-patches --vanilla %_sourcedir/series.conf %my_builddir %symbols
 rm -f $(find . -name ".gitignore")
 cd ..
 %endif
 cd linux-%kernelrelease%variant
-bash -ex %my_builddir/apply-patches.sh
+%_sourcedir/apply-patches %_sourcedir/series.conf %my_builddir %symbols
 rm -f $(find . -name ".gitignore")
 if [ -f %_sourcedir/localversion ] ; then
     cat %_sourcedir/localversion > localversion

kernel-source.spec.in

@@ -57,6 +57,7 @@ Source12:       pre.sh
 Source13:       post.sh
 Source14:       series.conf
 Source16:       guards
+Source17:       apply-patches
 Source21:       config.conf
 Source23:       supported.conf
 Source33:       check-for-config-changes
@@ -101,7 +102,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 Prefix:         /usr/src
 
-%(chmod +x %_sourcedir/{guards,check-for-config-changes,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols})
+%(chmod +x %_sourcedir/{apply-patches,guards,check-for-config-changes,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols})
 
 %define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
 %define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac)
@@ -152,25 +153,17 @@ ln -sf linux%variant linux%variant  # dummy symlink
 tar xjf %_sourcedir/linux-%srcversion.tar.bz2
 mv linux-%srcversion linux-%kernelrelease%variant
 
-# generate script to apply patches
-echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" \
-    >%my_builddir/apply-patches.sh
-%_sourcedir/guards %symbols <%_sourcedir/series.conf | \
-    sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i %my_builddir/:' \
-    >>%my_builddir/apply-patches.sh
 
 %if %do_vanilla
-egrep '^trap|patches\.(kernel\.org|rpmify)/' %my_builddir/apply-patches.sh \
-    >%my_builddir/apply-patches-vanilla.sh
 cp -al linux-%kernelrelease%variant linux-%kernelrelease-vanilla
 cd linux-%kernelrelease-vanilla
-bash -ex %my_builddir/apply-patches-vanilla.sh
+%_sourcedir/apply-patches --vanilla %_sourcedir/series.conf %my_builddir %symbols
 rm -f $(find . -name ".gitignore")
 cd ..
 %endif
 
 cd linux-%kernelrelease%variant
-bash -ex %my_builddir/apply-patches.sh
+%_sourcedir/apply-patches %_sourcedir/series.conf %my_builddir %symbols
 rm -f $(find . -name ".gitignore")
 
 if [ -f %_sourcedir/localversion ] ; then

kernel-syms.changes

@@ -1,3 +1,138 @@
+-------------------------------------------------------------------
+Thu Feb  4 13:23:57 CET 2010 - knikanth@suse.de
+
+- patches.fixes/dm-stripe-zero-stripes: dm-stripe: return -EINVAL
+  if stripe count is zero (bnc#576312).
+
+-------------------------------------------------------------------
+Thu Feb  4 12:17:25 CET 2010 - npiggin@suse.de
+
+- Disable patches.suse/files-slab-rcu.patch.
+
+-------------------------------------------------------------------
+Thu Feb  4 09:46:35 CET 2010 - tiwai@suse.de
+
+- supported.conf: mark snd-wss-lib unsupported
+
+-------------------------------------------------------------------
+Thu Feb  4 09:45:34 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2:
+  ALSA: hda - Adding support for another IDT 92HD83XXX codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Wed Feb  3 19:17:01 CET 2010 - jbohac@suse.cz
+
+- supported.conf: marked em_cmp supported (bnc#568130)
+
+-------------------------------------------------------------------
+Wed Feb  3 14:57:19 CET 2010 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: automatically install a matching
+  -devel package if kernel-source is installed.
+
+-------------------------------------------------------------------
+Wed Feb  3 13:06:15 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc6 and c/s 989.
+- patches.xen/xen-netback-generalize: Netback: Generalize
+  static/global variables into 'struct xen_netbk'.
+- patches.xen/xen-netback-kernel-threads: Use Kernel thread to
+  replace the tasklet.
+- patches.xen/xen-netback-multiple-tasklets: Netback:
+  Multiple tasklets support.
+
+-------------------------------------------------------------------
+Tue Feb  2 15:59:38 CET 2010 - jkosina@suse.cz
+
+- patches.suse/suse-ppc64-branding: the message about crashed kernel
+  doesn't make sense any more with CONFIG_CRASH_DUMP enabled by
+  default (bnc#575884).
+
+-------------------------------------------------------------------
+Sat Jan 30 21:51:35 CET 2010 - jeffm@suse.com
+
+- Update to 2.6.33-rc6.
+  - Eliminated 12 patches.
+
+-------------------------------------------------------------------
+Sat Jan 30 21:30:27 CET 2010 - jeffm@suse.com
+
+- patches.rpmify/hugetlbfs-fix-section-mismatches: Removed __init
+  from hugetlb_sysfs_add_hstate instead of adding it elsewhere.
+
+-------------------------------------------------------------------
+Sat Jan 30 09:05:13 CET 2010 - jslaby@suse.de
+
+- patches.suse/kdb-common: Fix hid crash (bnc#570591)
+
+-------------------------------------------------------------------
+Fri Jan 29 12:11:55 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support: ALSA:
+  hda - Add support for IDT 92HD88 family codecs (bnc#569354).
+
+-------------------------------------------------------------------
+Fri Jan 29 11:14:39 CET 2010 - jkosina@suse.cz
+
+- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch:
+  Update patch-mainline tag.
+
+-------------------------------------------------------------------
+Fri Jan 29 10:39:59 CET 2010 - jbenc@suse.cz
+
+- Update config files: fixed vanilla configs.
+
+-------------------------------------------------------------------
+Thu Jan 28 19:27:54 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led: ALSA:
+  hda - Add mute LED check for HP laptops with IDT 92HD83xxx codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Thu Jan 28 16:56:02 CET 2010 - jbeulich@novell.com
+
+- patches.suse/supported-flag: Fix -ec2 build.
+- patches.suse/supported-flag-enterprise: Refresh.
+- patches.xen/xen3-patch-2.6.33-rc3: Fix ia64 build.
+
+-------------------------------------------------------------------
+Thu Jan 28 16:28:01 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc5 and c/s 987.
+- config.conf: Re-enable Xen.
+- Update config files.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:50:18 CET 2010 - jbenc@suse.cz
+
+- Update config files: enabled CONFIG_CFG80211_WEXT to keep backward
+  user space compatibility and enabled few wireless drivers.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:37:22 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: Add support for an additional series file in
+  patches.addon/series, this will be applied after the main series.
+
+-------------------------------------------------------------------
+Thu Jan 28 11:17:01 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: put the patch loops from kernel-binary.spec.in
+  and kernel-source.spec.in to one place.
+
+-------------------------------------------------------------------
+Wed Jan 27 20:24:43 CET 2010 - jeffm@suse.de
+
+- Deleted 28 unused patches.
+
+-------------------------------------------------------------------
+Wed Jan 27 15:56:48 CET 2010 - jeffm@suse.com
+
+- Update config files.
+
 -------------------------------------------------------------------
 Wed Jan 27 14:55:29 CET 2010 - jkosina@suse.cz
 

kernel-syms.spec

@@ -23,7 +23,7 @@
 Name:           kernel-syms
 Summary:        Kernel Symbol Versions (modversions)
 Version:        2.6.33
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
@@ -48,6 +48,9 @@ Requires:       kernel-ppc64-devel = %version-%source_rel
 %ifarch s390
 Requires:       kernel-s390-devel = %version-%source_rel
 %endif
+%ifarch %ix86 x86_64
+Requires:       kernel-xen-devel = %version-%source_rel
+%endif
 Provides:       multiversion(kernel)
 Source:         README.KSYMS
 Requires:       kernel-source%variant = %version-%source_rel

kernel-trace.changes

@@ -1,3 +1,138 @@
+-------------------------------------------------------------------
+Thu Feb  4 13:23:57 CET 2010 - knikanth@suse.de
+
+- patches.fixes/dm-stripe-zero-stripes: dm-stripe: return -EINVAL
+  if stripe count is zero (bnc#576312).
+
+-------------------------------------------------------------------
+Thu Feb  4 12:17:25 CET 2010 - npiggin@suse.de
+
+- Disable patches.suse/files-slab-rcu.patch.
+
+-------------------------------------------------------------------
+Thu Feb  4 09:46:35 CET 2010 - tiwai@suse.de
+
+- supported.conf: mark snd-wss-lib unsupported
+
+-------------------------------------------------------------------
+Thu Feb  4 09:45:34 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2:
+  ALSA: hda - Adding support for another IDT 92HD83XXX codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Wed Feb  3 19:17:01 CET 2010 - jbohac@suse.cz
+
+- supported.conf: marked em_cmp supported (bnc#568130)
+
+-------------------------------------------------------------------
+Wed Feb  3 14:57:19 CET 2010 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: automatically install a matching
+  -devel package if kernel-source is installed.
+
+-------------------------------------------------------------------
+Wed Feb  3 13:06:15 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc6 and c/s 989.
+- patches.xen/xen-netback-generalize: Netback: Generalize
+  static/global variables into 'struct xen_netbk'.
+- patches.xen/xen-netback-kernel-threads: Use Kernel thread to
+  replace the tasklet.
+- patches.xen/xen-netback-multiple-tasklets: Netback:
+  Multiple tasklets support.
+
+-------------------------------------------------------------------
+Tue Feb  2 15:59:38 CET 2010 - jkosina@suse.cz
+
+- patches.suse/suse-ppc64-branding: the message about crashed kernel
+  doesn't make sense any more with CONFIG_CRASH_DUMP enabled by
+  default (bnc#575884).
+
+-------------------------------------------------------------------
+Sat Jan 30 21:51:35 CET 2010 - jeffm@suse.com
+
+- Update to 2.6.33-rc6.
+  - Eliminated 12 patches.
+
+-------------------------------------------------------------------
+Sat Jan 30 21:30:27 CET 2010 - jeffm@suse.com
+
+- patches.rpmify/hugetlbfs-fix-section-mismatches: Removed __init
+  from hugetlb_sysfs_add_hstate instead of adding it elsewhere.
+
+-------------------------------------------------------------------
+Sat Jan 30 09:05:13 CET 2010 - jslaby@suse.de
+
+- patches.suse/kdb-common: Fix hid crash (bnc#570591)
+
+-------------------------------------------------------------------
+Fri Jan 29 12:11:55 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support: ALSA:
+  hda - Add support for IDT 92HD88 family codecs (bnc#569354).
+
+-------------------------------------------------------------------
+Fri Jan 29 11:14:39 CET 2010 - jkosina@suse.cz
+
+- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch:
+  Update patch-mainline tag.
+
+-------------------------------------------------------------------
+Fri Jan 29 10:39:59 CET 2010 - jbenc@suse.cz
+
+- Update config files: fixed vanilla configs.
+
+-------------------------------------------------------------------
+Thu Jan 28 19:27:54 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led: ALSA:
+  hda - Add mute LED check for HP laptops with IDT 92HD83xxx codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Thu Jan 28 16:56:02 CET 2010 - jbeulich@novell.com
+
+- patches.suse/supported-flag: Fix -ec2 build.
+- patches.suse/supported-flag-enterprise: Refresh.
+- patches.xen/xen3-patch-2.6.33-rc3: Fix ia64 build.
+
+-------------------------------------------------------------------
+Thu Jan 28 16:28:01 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc5 and c/s 987.
+- config.conf: Re-enable Xen.
+- Update config files.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:50:18 CET 2010 - jbenc@suse.cz
+
+- Update config files: enabled CONFIG_CFG80211_WEXT to keep backward
+  user space compatibility and enabled few wireless drivers.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:37:22 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: Add support for an additional series file in
+  patches.addon/series, this will be applied after the main series.
+
+-------------------------------------------------------------------
+Thu Jan 28 11:17:01 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: put the patch loops from kernel-binary.spec.in
+  and kernel-source.spec.in to one place.
+
+-------------------------------------------------------------------
+Wed Jan 27 20:24:43 CET 2010 - jeffm@suse.de
+
+- Deleted 28 unused patches.
+
+-------------------------------------------------------------------
+Wed Jan 27 15:56:48 CET 2010 - jeffm@suse.com
+
+- Update config files.
+
 -------------------------------------------------------------------
 Wed Jan 27 14:55:29 CET 2010 - jkosina@suse.cz
 

kernel-trace.spec

@@ -18,7 +18,7 @@
 # norootforbuild
 
 %define srcversion 2.6.32
-%define patchversion 2.6.33-rc5
+%define patchversion 2.6.33-rc6
 %define variant %{nil}
 %include %_sourcedir/kernel-spec-macros
 %define build_flavor	trace
@@ -31,7 +31,7 @@
 %define obj_install_dir %src_install_dir-obj
 %define rpm_install_dir %buildroot%obj_install_dir
 %define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
 %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
 %define cpu_arch_flavor %cpu_arch/%build_flavor
 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
@@ -49,7 +49,7 @@
 Name:           kernel-trace
 Summary:        The Realtime Linux Kernel
 Version:        2.6.33
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif
@@ -236,15 +236,11 @@ supported_conf() {
 } > %kernel_build_dir/Module.supported
 supported_conf --default=0 base >%kernel_build_dir/Module.base
 cd linux-%srcversion
-# Apply patches
+%_sourcedir/apply-patches \
-echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
+%if %{build_vanilla}
-%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
+	--vanilla \
-%if %build_vanilla
-    egrep '^patches\.(kernel\.org|rpmify)/' | \
 %endif
-    sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \
+	%_sourcedir/series.conf .. $SYMBOLS
-    >>../apply-patches.sh
-bash -ex ../apply-patches.sh
 cd %kernel_build_dir
 if [ -f %_sourcedir/localversion ] ; then
     cat %_sourcedir/localversion > localversion
@@ -728,6 +724,7 @@ Group:          Development/Sources
 Provides:       multiversion(kernel)
 Provides:       %name-devel = %version-%source_rel
 Requires:       kernel-source%variant = %version-%source_rel
+Supplements:    packageand(%name:kernel-source)
 AutoReqProv:    on
 
 %description devel

kernel-vanilla.changes

@@ -1,3 +1,138 @@
+-------------------------------------------------------------------
+Thu Feb  4 13:23:57 CET 2010 - knikanth@suse.de
+
+- patches.fixes/dm-stripe-zero-stripes: dm-stripe: return -EINVAL
+  if stripe count is zero (bnc#576312).
+
+-------------------------------------------------------------------
+Thu Feb  4 12:17:25 CET 2010 - npiggin@suse.de
+
+- Disable patches.suse/files-slab-rcu.patch.
+
+-------------------------------------------------------------------
+Thu Feb  4 09:46:35 CET 2010 - tiwai@suse.de
+
+- supported.conf: mark snd-wss-lib unsupported
+
+-------------------------------------------------------------------
+Thu Feb  4 09:45:34 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2:
+  ALSA: hda - Adding support for another IDT 92HD83XXX codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Wed Feb  3 19:17:01 CET 2010 - jbohac@suse.cz
+
+- supported.conf: marked em_cmp supported (bnc#568130)
+
+-------------------------------------------------------------------
+Wed Feb  3 14:57:19 CET 2010 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: automatically install a matching
+  -devel package if kernel-source is installed.
+
+-------------------------------------------------------------------
+Wed Feb  3 13:06:15 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc6 and c/s 989.
+- patches.xen/xen-netback-generalize: Netback: Generalize
+  static/global variables into 'struct xen_netbk'.
+- patches.xen/xen-netback-kernel-threads: Use Kernel thread to
+  replace the tasklet.
+- patches.xen/xen-netback-multiple-tasklets: Netback:
+  Multiple tasklets support.
+
+-------------------------------------------------------------------
+Tue Feb  2 15:59:38 CET 2010 - jkosina@suse.cz
+
+- patches.suse/suse-ppc64-branding: the message about crashed kernel
+  doesn't make sense any more with CONFIG_CRASH_DUMP enabled by
+  default (bnc#575884).
+
+-------------------------------------------------------------------
+Sat Jan 30 21:51:35 CET 2010 - jeffm@suse.com
+
+- Update to 2.6.33-rc6.
+  - Eliminated 12 patches.
+
+-------------------------------------------------------------------
+Sat Jan 30 21:30:27 CET 2010 - jeffm@suse.com
+
+- patches.rpmify/hugetlbfs-fix-section-mismatches: Removed __init
+  from hugetlb_sysfs_add_hstate instead of adding it elsewhere.
+
+-------------------------------------------------------------------
+Sat Jan 30 09:05:13 CET 2010 - jslaby@suse.de
+
+- patches.suse/kdb-common: Fix hid crash (bnc#570591)
+
+-------------------------------------------------------------------
+Fri Jan 29 12:11:55 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support: ALSA:
+  hda - Add support for IDT 92HD88 family codecs (bnc#569354).
+
+-------------------------------------------------------------------
+Fri Jan 29 11:14:39 CET 2010 - jkosina@suse.cz
+
+- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch:
+  Update patch-mainline tag.
+
+-------------------------------------------------------------------
+Fri Jan 29 10:39:59 CET 2010 - jbenc@suse.cz
+
+- Update config files: fixed vanilla configs.
+
+-------------------------------------------------------------------
+Thu Jan 28 19:27:54 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led: ALSA:
+  hda - Add mute LED check for HP laptops with IDT 92HD83xxx codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Thu Jan 28 16:56:02 CET 2010 - jbeulich@novell.com
+
+- patches.suse/supported-flag: Fix -ec2 build.
+- patches.suse/supported-flag-enterprise: Refresh.
+- patches.xen/xen3-patch-2.6.33-rc3: Fix ia64 build.
+
+-------------------------------------------------------------------
+Thu Jan 28 16:28:01 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc5 and c/s 987.
+- config.conf: Re-enable Xen.
+- Update config files.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:50:18 CET 2010 - jbenc@suse.cz
+
+- Update config files: enabled CONFIG_CFG80211_WEXT to keep backward
+  user space compatibility and enabled few wireless drivers.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:37:22 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: Add support for an additional series file in
+  patches.addon/series, this will be applied after the main series.
+
+-------------------------------------------------------------------
+Thu Jan 28 11:17:01 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: put the patch loops from kernel-binary.spec.in
+  and kernel-source.spec.in to one place.
+
+-------------------------------------------------------------------
+Wed Jan 27 20:24:43 CET 2010 - jeffm@suse.de
+
+- Deleted 28 unused patches.
+
+-------------------------------------------------------------------
+Wed Jan 27 15:56:48 CET 2010 - jeffm@suse.com
+
+- Update config files.
+
 -------------------------------------------------------------------
 Wed Jan 27 14:55:29 CET 2010 - jkosina@suse.cz
 

kernel-vanilla.spec

@@ -18,7 +18,7 @@
 # norootforbuild
 
 %define srcversion 2.6.32
-%define patchversion 2.6.33-rc5
+%define patchversion 2.6.33-rc6
 %define variant %{nil}
 %include %_sourcedir/kernel-spec-macros
 %define build_flavor	vanilla
@@ -31,7 +31,7 @@
 %define obj_install_dir %src_install_dir-obj
 %define rpm_install_dir %buildroot%obj_install_dir
 %define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
 %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
 %define cpu_arch_flavor %cpu_arch/%build_flavor
 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
@@ -49,7 +49,7 @@
 Name:           kernel-vanilla
 Summary:        The Standard Kernel - without any SUSE patches
 Version:        2.6.33
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif
@@ -232,15 +232,11 @@ supported_conf() {
 } > %kernel_build_dir/Module.supported
 supported_conf --default=0 base >%kernel_build_dir/Module.base
 cd linux-%srcversion
-# Apply patches
+%_sourcedir/apply-patches \
-echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
+%if %{build_vanilla}
-%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
+	--vanilla \
-%if %build_vanilla
-    egrep '^patches\.(kernel\.org|rpmify)/' | \
 %endif
-    sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \
+	%_sourcedir/series.conf .. $SYMBOLS
-    >>../apply-patches.sh
-bash -ex ../apply-patches.sh
 cd %kernel_build_dir
 if [ -f %_sourcedir/localversion ] ; then
     cat %_sourcedir/localversion > localversion
@@ -724,6 +720,7 @@ Group:          Development/Sources
 Provides:       multiversion(kernel)
 Provides:       %name-devel = %version-%source_rel
 Requires:       kernel-source%variant = %version-%source_rel
+Supplements:    packageand(%name:kernel-source)
 AutoReqProv:    on
 
 %description devel

kernel-vmi.changes

@@ -1,3 +1,138 @@
+-------------------------------------------------------------------
+Thu Feb  4 13:23:57 CET 2010 - knikanth@suse.de
+
+- patches.fixes/dm-stripe-zero-stripes: dm-stripe: return -EINVAL
+  if stripe count is zero (bnc#576312).
+
+-------------------------------------------------------------------
+Thu Feb  4 12:17:25 CET 2010 - npiggin@suse.de
+
+- Disable patches.suse/files-slab-rcu.patch.
+
+-------------------------------------------------------------------
+Thu Feb  4 09:46:35 CET 2010 - tiwai@suse.de
+
+- supported.conf: mark snd-wss-lib unsupported
+
+-------------------------------------------------------------------
+Thu Feb  4 09:45:34 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2:
+  ALSA: hda - Adding support for another IDT 92HD83XXX codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Wed Feb  3 19:17:01 CET 2010 - jbohac@suse.cz
+
+- supported.conf: marked em_cmp supported (bnc#568130)
+
+-------------------------------------------------------------------
+Wed Feb  3 14:57:19 CET 2010 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: automatically install a matching
+  -devel package if kernel-source is installed.
+
+-------------------------------------------------------------------
+Wed Feb  3 13:06:15 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc6 and c/s 989.
+- patches.xen/xen-netback-generalize: Netback: Generalize
+  static/global variables into 'struct xen_netbk'.
+- patches.xen/xen-netback-kernel-threads: Use Kernel thread to
+  replace the tasklet.
+- patches.xen/xen-netback-multiple-tasklets: Netback:
+  Multiple tasklets support.
+
+-------------------------------------------------------------------
+Tue Feb  2 15:59:38 CET 2010 - jkosina@suse.cz
+
+- patches.suse/suse-ppc64-branding: the message about crashed kernel
+  doesn't make sense any more with CONFIG_CRASH_DUMP enabled by
+  default (bnc#575884).
+
+-------------------------------------------------------------------
+Sat Jan 30 21:51:35 CET 2010 - jeffm@suse.com
+
+- Update to 2.6.33-rc6.
+  - Eliminated 12 patches.
+
+-------------------------------------------------------------------
+Sat Jan 30 21:30:27 CET 2010 - jeffm@suse.com
+
+- patches.rpmify/hugetlbfs-fix-section-mismatches: Removed __init
+  from hugetlb_sysfs_add_hstate instead of adding it elsewhere.
+
+-------------------------------------------------------------------
+Sat Jan 30 09:05:13 CET 2010 - jslaby@suse.de
+
+- patches.suse/kdb-common: Fix hid crash (bnc#570591)
+
+-------------------------------------------------------------------
+Fri Jan 29 12:11:55 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support: ALSA:
+  hda - Add support for IDT 92HD88 family codecs (bnc#569354).
+
+-------------------------------------------------------------------
+Fri Jan 29 11:14:39 CET 2010 - jkosina@suse.cz
+
+- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch:
+  Update patch-mainline tag.
+
+-------------------------------------------------------------------
+Fri Jan 29 10:39:59 CET 2010 - jbenc@suse.cz
+
+- Update config files: fixed vanilla configs.
+
+-------------------------------------------------------------------
+Thu Jan 28 19:27:54 CET 2010 - tiwai@suse.de
+
+- patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led: ALSA:
+  hda - Add mute LED check for HP laptops with IDT 92HD83xxx codec
+  (bnc#569354).
+
+-------------------------------------------------------------------
+Thu Jan 28 16:56:02 CET 2010 - jbeulich@novell.com
+
+- patches.suse/supported-flag: Fix -ec2 build.
+- patches.suse/supported-flag-enterprise: Refresh.
+- patches.xen/xen3-patch-2.6.33-rc3: Fix ia64 build.
+
+-------------------------------------------------------------------
+Thu Jan 28 16:28:01 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc5 and c/s 987.
+- config.conf: Re-enable Xen.
+- Update config files.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:50:18 CET 2010 - jbenc@suse.cz
+
+- Update config files: enabled CONFIG_CFG80211_WEXT to keep backward
+  user space compatibility and enabled few wireless drivers.
+
+-------------------------------------------------------------------
+Thu Jan 28 14:37:22 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: Add support for an additional series file in
+  patches.addon/series, this will be applied after the main series.
+
+-------------------------------------------------------------------
+Thu Jan 28 11:17:01 CET 2010 - mmarek@suse.cz
+
+- rpm/apply-patches: put the patch loops from kernel-binary.spec.in
+  and kernel-source.spec.in to one place.
+
+-------------------------------------------------------------------
+Wed Jan 27 20:24:43 CET 2010 - jeffm@suse.de
+
+- Deleted 28 unused patches.
+
+-------------------------------------------------------------------
+Wed Jan 27 15:56:48 CET 2010 - jeffm@suse.com
+
+- Update config files.
+
 -------------------------------------------------------------------
 Wed Jan 27 14:55:29 CET 2010 - jkosina@suse.cz
 

kernel-vmi.spec

@@ -18,7 +18,7 @@
 # norootforbuild
 
 %define srcversion 2.6.32
-%define patchversion 2.6.33-rc5
+%define patchversion 2.6.33-rc6
 %define variant %{nil}
 %include %_sourcedir/kernel-spec-macros
 %define build_flavor	vmi
@@ -31,7 +31,7 @@
 %define obj_install_dir %src_install_dir-obj
 %define rpm_install_dir %buildroot%obj_install_dir
 %define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
 %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
 %define cpu_arch_flavor %cpu_arch/%build_flavor
 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
@@ -49,7 +49,7 @@
 Name:           kernel-vmi
 Summary:        VMI-enabled kernel
 Version:        2.6.33
-Release:        1
+Release:        2
 %if %using_buildservice
 %else
 %endif
@@ -225,15 +225,11 @@ supported_conf() {
 } > %kernel_build_dir/Module.supported
 supported_conf --default=0 base >%kernel_build_dir/Module.base
 cd linux-%srcversion
-# Apply patches
+%_sourcedir/apply-patches \
-echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
+%if %{build_vanilla}
-%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
+	--vanilla \
-%if %build_vanilla
-    egrep '^patches\.(kernel\.org|rpmify)/' | \
 %endif
-    sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \
+	%_sourcedir/series.conf .. $SYMBOLS
-    >>../apply-patches.sh
-bash -ex ../apply-patches.sh
 cd %kernel_build_dir
 if [ -f %_sourcedir/localversion ] ; then
     cat %_sourcedir/localversion > localversion
@@ -719,6 +715,7 @@ Group:          Development/Sources
 Provides:       multiversion(kernel)
 Provides:       %name-devel = %version-%source_rel
 Requires:       kernel-source%variant = %version-%source_rel
+Supplements:    packageand(%name:kernel-source)
 AutoReqProv:    on
 
 %description devel

kernel-xen.spec

@@ -0,0 +1,766 @@
+#
+# spec file for package kernel-xen (Version 2.6.33)
+#
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+# norootforbuild
+
+%define srcversion 2.6.32
+%define patchversion 2.6.33-rc6
+%define variant %{nil}
+%include %_sourcedir/kernel-spec-macros
+%define build_flavor	xen
+%define build_kdump	(%build_flavor == "kdump")
+%define build_xen	(%build_flavor == "xen" || %build_flavor == "ec2")
+%define build_vanilla	(%build_flavor == "vanilla")
+%define build_ps3	(%build_flavor == "ps3")
+%define build_src_dir %my_builddir/linux-%srcversion
+%define src_install_dir /usr/src/linux-%kernelrelease%variant
+%define obj_install_dir %src_install_dir-obj
+%define rpm_install_dir %buildroot%obj_install_dir
+%define kernel_build_dir %my_builddir/linux-obj
+%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
+%define cpu_arch_flavor %cpu_arch/%build_flavor
+# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
+# defining them all at once.)
+%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
+%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
+%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
+%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
+%ifarch %ix86 x86_64
+%define install_vdso 1
+%else
+%define install_vdso 0
+%endif
+
+Name:           kernel-xen
+Summary:        The Xen Kernel
+Version:        2.6.33
+Release:        1
+%if %using_buildservice
+%else
+%endif
+License:        GPLv2
+Group:          System/Kernel
+Url:            http://www.kernel.org/
+AutoReqProv:    on
+BuildRequires:  coreutils module-init-tools sparse
+BuildRequires:  fdupes
+Provides:       multiversion(kernel)
+Provides:       %{name}_%_target_cpu = %version-%release
+%if %split_base
+Provides:       kernel-base = %version-%source_rel
+# Obsolete the -base subpackage from 11.1 and 11.2 development phase
+Obsoletes:      %name-base <= 2.6.31
+%endif
+Requires(pre):  coreutils awk
+# Need a module-init-tools with /usr/lib/module-init-tools/weak-modules2
+Requires(post): module-init-tools >= 3.4
+# This Requires is wrong, because the post/postun scripts have a
+# test -x update-bootloader, having perl-Bootloader is not a hard requirement.
+# But, there is no way to tell rpm or yast to schedule the installation
+# of perl-Bootloader before kernel-binary.rpm if both are in the list of
+# packages to install/update. Likewise, this is true for mkinitrd.
+# Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry
+Requires(post): perl-Bootloader >= 0.4.15
+Requires(post): mkinitrd
+#!BuildIgnore:  perl-Bootloader mkinitrd
+%ifarch ia64
+# arch/ia64/scripts/unwcheck.py
+BuildRequires:  python
+%endif
+%ifarch s390 s390x
+%if %build_vanilla
+BuildRequires:  dwarfextract
+%endif
+%endif
+%if %build_xen
+%ifarch %ix86
+%if %build_flavor != "ec2"
+Provides:       kernel-xenpae = %version
+Obsoletes:      kernel-xenpae <= %version
+%endif
+%endif
+#!BuildIgnore:  xen
+%endif
+Provides:       %name-nongpl
+Obsoletes:      %name-nongpl
+%if %build_vanilla
+# force bzip2 instead of lzma compression to allow install on older dist versions
+%define _binary_payload w9.bzdio
+%endif
+# dead network if installed on SLES10, otherwise it will work (mostly)
+Conflicts:      sysfsutils < 2.0
+%if ! %build_vanilla
+Conflicts:      apparmor-profiles <= 2.1
+Conflicts:      apparmor-parser < 2.3
+# root-lvm only works with newer udevs
+Conflicts:      udev < 118
+Conflicts:      lvm2 < 2.02.33
+%endif
+%ifarch %ix86
+Conflicts:      libc.so.6()(64bit)
+%endif
+Provides:       kernel = %version-%source_rel
+Source0:        http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
+Source10:       preun.sh
+Source11:       postun.sh
+Source12:       pre.sh
+Source13:       post.sh
+Source20:       series.conf
+Source22:       supported.conf
+Source30:       arch-symbols
+Source31:       guards
+Source33:       check-for-config-changes
+Source34:       check-supported-list
+Source40:       source-timestamp
+Source44:       find-provides
+Source46:       modversions
+Source47:       kabi.pl
+Source48:       split-modules
+Source49:       kernel-spec-macros
+Source100:      config.tar.bz2
+Source101:      patches.arch.tar.bz2
+Source102:      patches.drivers.tar.bz2
+Source103:      patches.fixes.tar.bz2
+Source104:      patches.rpmify.tar.bz2
+Source105:      patches.suse.tar.bz2
+Source107:      patches.xen.tar.bz2
+Source108:      patches.addon.tar.bz2
+Source109:      patches.kernel.org.tar.bz2
+Source110:      patches.apparmor.tar.bz2
+Source111:      patches.rt.tar.bz2
+Source112:      patches.trace.tar.bz2
+Source113:      patches.kabi.tar.bz2
+Source120:      kabi.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+ExclusiveArch:  %ix86 x86_64
+# These files are found in the kernel-source package:
+NoSource:       0
+NoSource:       100
+NoSource:       101
+NoSource:       102
+NoSource:       103
+NoSource:       104
+NoSource:       105
+NoSource:       107
+NoSource:       108
+NoSource:       109
+NoSource:       110
+NoSource:       111
+NoSource:       120
+# The following KMPs have been integrated into the kernel package.
+# sles10 / 10.3
+Obsoletes:      iwlwifi-kmp-%build_flavor
+Obsoletes:      ipw3945-kmp-%build_flavor
+# sles10 / 11.0
+Obsoletes:      uvcvideo-kmp-%build_flavor
+# 10.3
+Obsoletes:      adm8211-kmp-%build_flavor
+Obsoletes:      rt2x00-kmp-%build_flavor
+Obsoletes:      rfswitch-kmp-%build_flavor
+# 11.0
+Obsoletes:      atl2-kmp-%build_flavor
+Obsoletes:      wlan-ng-kmp-%build_flavor
+Obsoletes:      et131x-kmp-%build_flavor
+Obsoletes:      ivtv-kmp-%build_flavor
+Obsoletes:      at76_usb-kmp-%build_flavor
+Obsoletes:      pcc-acpi-kmp-%build_flavor
+Obsoletes:      btusb-kmp-%build_flavor
+# sle11-ga
+Obsoletes:      enic-kmp-%build_flavor
+Obsoletes:      fnic-kmp-%build_flavor
+Obsoletes:      brocade-bfa-kmp-%build_flavor
+Obsoletes:      kvm-kmp-%build_flavor
+Obsoletes:      perfmon-kmp-%build_flavor
+# sle11
+Obsoletes:      ocfs2-kmp-%build_flavor
+# 11.1
+Obsoletes:      quickcam-kmp-%build_flavor < 0.6.7
+# Provide the exported symbols as "ksym(symbol) = hash"
+%define __find_provides %_sourcedir/find-provides %my_builddir %name
+# Will modules not listed in supported.conf abort the kernel build (0/1)?
+%define supported_modules_check 0
+
+%description
+The Linux kernel for Xen paravirtualization.
+
+This kernel can be used both as the domain0 ("xen0") and as an
+unprivileged ("xenU") kernel.
+
+
+%source_timestamp
+%prep
+if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
+    echo "The %name-%version.nosrc.rpm package does not contain the" \
+	 "complete sources. Please install kernel-source-%version.src.rpm."
+    exit 1
+fi
+SYMBOLS=
+if test -e %_sourcedir/extra-symbols; then
+	SYMBOLS=$(cat %_sourcedir/extra-symbols)
+	echo "extra symbol(s):" $SYMBOLS
+fi
+# Unpack all sources and patches
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+mkdir -p %kernel_build_dir
+supported_conf() {
+	%_sourcedir/guards $* < %_sourcedir/supported.conf | \
+	sed 's,.*/,,; s,\.ko$,,' | sort -u
+}
+# Generate the list of modules to be marked as supported
+{   supported_conf base
+    supported_conf --default=0 external | sed 's/$/ external/'
+} > %kernel_build_dir/Module.supported
+supported_conf --default=0 base >%kernel_build_dir/Module.base
+cd linux-%srcversion
+%_sourcedir/apply-patches \
+%if %{build_vanilla}
+	--vanilla \
+%endif
+	%_sourcedir/series.conf .. $SYMBOLS
+cd %kernel_build_dir
+if [ -f %_sourcedir/localversion ] ; then
+    cat %_sourcedir/localversion > localversion
+fi
+cp ../config/%cpu_arch_flavor .config
+%build_src_dir/scripts/config \
+	--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+	--enable  CONFIG_SUSE_KERNEL \
+%if 0%{?__debug_package:1}
+	--enable  CONFIG_DEBUG_INFO
+%else
+	--disable CONFIG_DEBUG_INFO
+%endif
+MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
+if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
+    yes '' | make oldconfig $MAKE_ARGS
+else
+    cp .config .config.orig
+    make silentoldconfig $MAKE_ARGS < /dev/null
+    %_sourcedir/check-for-config-changes .config.orig .config
+    rm .config.orig
+fi
+make prepare $MAKE_ARGS
+make scripts $MAKE_ARGS
+krel=$(make -s kernelrelease $MAKE_ARGS)
+if [ "$krel" != "%kernelrelease-%build_flavor" ]; then
+    echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2
+    exit 1
+fi
+make clean $MAKE_ARGS
+rm -f source
+find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
+cat > .kernel-binary.spec.buildenv <<EOF
+# Override the timestamp 'uname -v' reports with the build
+# timestamp.
+export KBUILD_BUILD_VERSION="$(grep SHA1_ID %_sourcedir/source-timestamp | awk '{ print $2 }')"
+export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/source-timestamp)"
+# The following branch/timestamp will end up in Oopses.
+export OOPS_TIMESTAMP="$(
+    echo -n $(sed -ne 's/^GIT Branch: \(.*\)/\1-/p' \
+		  %_sourcedir/source-timestamp)
+    head -n 1 %_sourcedir/source-timestamp \
+	| tr -dc 0-9)"
+export KBUILD_VERBOSE=0
+export KBUILD_SYMTYPES=1
+export KBUILD_OVERRIDE=1
+EOF
+
+%build
+cd %kernel_build_dir
+source .kernel-binary.spec.buildenv
+# create *.symref files in the tree
+if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
+    %_sourcedir/modversions --unpack . < $_
+fi
+# If the %jobs macro is defined to a number, make will spawn that many jobs.
+# There are several ways how to define it:
+# If you are using the build script:
+#     build --jobs=N kernel-$flavor.spec
+# With plain rpmbuild:
+#     rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
+# To spawn as many jobs as there are cpu cores:
+#     rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
+#         kernel-$flavor.spec
+# You can also set this permanently in ~/.rpmmacros:
+#     %jobs 0%(grep -c ^processor /proc/cpuinfo)
+%if %CONFIG_KMSG_IDS == "y"
+    chmod +x ../linux-%srcversion/scripts/kmsg-doc
+    make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
+%else
+    make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
+%endif
+
+%install
+# get rid of /usr/lib/rpm/brp-strip-debug
+# strip removes too much from the vmlinux ELF binary
+export NO_BRP_STRIP_DEBUG=true
+# /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the
+# kernel-source package is installed. Don't check for stale symlinks
+# in the brp-symlink check:
+export NO_BRP_STALE_LINK_ERROR=yes
+cd %kernel_build_dir
+mkdir -p %buildroot/boot
+# (Could strip out non-public symbols.)
+cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
+add_vmlinux()
+{
+    local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false
+    if test $1 == "--compressed"; then
+        compressed=true
+    fi
+    cp vmlinux %buildroot/$vmlinux
+    >%my_builddir/vmlinux.debug.files
+%if 0%{?__debug_package:1}
+    if $compressed; then
+        local vmlinux_debug=usr/lib/debug/$vmlinux.debug
+        mkdir -p $(dirname %buildroot/$vmlinux_debug)
+        /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
+    			   -l vmlinux.sourcefiles %buildroot/$vmlinux
+        # FIXME: create and package build-id symlinks
+        objcopy --only-keep-debug \
+    	    %buildroot/$vmlinux \
+    	    %buildroot/$vmlinux_debug || :
+        objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
+    	    --strip-debug \
+    	    %buildroot/$vmlinux || :
+        mkdir -p %buildroot/usr/src/debug
+        LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \
+    	| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
+        find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
+        find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
+        echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
+    else
+        # make vmlinux executable so that find-debuginfo.sh picks it up
+        # (TODO: fix find-debuginfo.sh instead)
+        chmod +x %buildroot/$vmlinux
+        # exctact the provided symbols before they are stripped away
+        echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \
+            %my_builddir/$(basename $vmlinux).provides
+    fi
+%endif
+    if $compressed; then
+	gzip -9 %buildroot/$vmlinux
+        chmod a-x %buildroot/$vmlinux.gz
+    fi
+}
+%if %build_kdump
+    add_vmlinux
+    image=vmlinux
+%else
+# architecture specifics
+%ifarch %ix86 x86_64
+    add_vmlinux --compressed
+%if %build_xen
+    image=vmlinuz
+%else
+    image=bzImage
+%endif
+    cp -p arch/x86/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
+    image=vmlinuz
+%endif
+%ifarch alpha
+    add_vmlinux --compressed
+    cp -p arch/alpha/boot/vmlinux.gz %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
+    image=vmlinuz
+%endif
+%ifarch ppc ppc64
+    add_vmlinux
+    image=vmlinux
+%endif
+%ifarch ia64
+    add_vmlinux --compressed
+    mv %buildroot/boot/vmlinux-%kernelrelease-%build_flavor.gz \
+       %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
+    image=vmlinuz
+%endif
+%ifarch s390 s390x
+    add_vmlinux --compressed
+    cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
+    image=image
+    if test -e arch/s390/boot/kerntypes.o; then
+        cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
+    elif test -x "$(which dwarfextract 2>/dev/null)"; then
+	dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
+    fi
+%if %CONFIG_KMSG_IDS == "y"
+    mkdir -p %buildroot/usr/share/man/man9
+    find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
+%endif
+%endif
+# end of build_kdump
+%endif
+for sub in '-base' '' '-extra'; do
+    case "$sub" in
+    '-base' | '') base_package=1 ;;
+    *) base_package=0 ;;
+    esac
+    for script in preun postun pre post devel-pre devel-post; do
+        sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
+            -e "s:@IMAGE@:$image:g" \
+            -e "s:@FLAVOR""@:%build_flavor:g" \
+            -e "s:@SUBPACKAGE@:%name$sub:g" \
+            -e "s:@BASE_PACKAGE@:$base_package:g" \
+            -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \
+            -e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \
+	    -e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
+            -e "s:@SRCVARIANT@:%variant:g" \
+            %_sourcedir/$script.sh > %my_builddir/$script$sub.sh
+    done
+done
+%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
+# keep this -suffix list in sync with post.sh and postun.sh
+suffix=-%build_flavor
+%endif
+ln -s $image$suffix %buildroot/boot/$image$suffix
+ln -s initrd$suffix %buildroot/boot/initrd$suffix
+cp .config %buildroot/boot/config-%kernelrelease-%build_flavor
+%if %install_vdso
+# Install the unstripped vdso's that are linked in the kernel image
+make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
+%endif
+# Create a dummy initrd with roughly the size the real one will have.
+# That way, YaST will know that this package requires some additional
+# space in /boot.
+dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
+	bs=1024 seek=2047 count=1
+if [ %CONFIG_MODULES = y ]; then
+    mkdir -p %rpm_install_dir/%cpu_arch_flavor
+    mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
+    ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
+    gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
+    make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
+    if ! %_sourcedir/check-supported-list \
+	    %_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
+%if %supported_modules_check
+	exit 1
+%endif
+	echo "Consistency check error: please update supported.conf."
+    fi
+%ifarch s390 s390x
+    if test -e arch/s390/boot/kerntypes.o; then
+        :
+    elif test -x "$(which dwarfextract 2>/dev/null)" -a \
+	-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then
+	find %buildroot -name "*.ko" > kofiles.list
+	dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
+    fi
+%endif
+    # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
+    # so that kernel-source + kernel-%build_flavor is sufficient for building
+    # modules that have modversions as well.
+    mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
+    cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
+    # Table of types used in exported symbols (for modversion debugging).
+    %_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor
+    if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then
+	gzip -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor
+    else
+	rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor
+    fi
+    # Some architecture's $(uname -m) output is different from the ARCH
+    # parameter that needs to be passed to kbuild. Create symlinks from
+    # $(uname -m) to the ARCH directory.
+    if [ ! -e %rpm_install_dir/%_target_cpu ]; then
+	ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
+	ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
+    fi
+    # We were building in %my_builddir/linux-%srcversion, but the sources will
+    # later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
+    # build symlink.
+    rm -f %buildroot/lib/modules/%kernelrelease-%build_flavor/{source,build}
+    ln -s %src_install_dir \
+	%buildroot/lib/modules/%kernelrelease-%build_flavor/source
+    ln -s %obj_install_dir/%cpu_arch/%build_flavor \
+	%buildroot/lib/modules/%kernelrelease-%build_flavor/build
+    # Abort if there are any undefined symbols
+    msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
+			-b %buildroot -ae %kernelrelease-%build_flavor 2>&1)"
+    if [ $? -ne 0 ] || echo "$msg" | grep  'needs unknown symbol'; then
+	exit 1
+    fi
+%if %split_base
+    %_sourcedir/split-modules -d %buildroot \
+	-o %my_builddir \
+	-b %kernel_build_dir/Module.base \
+	-s %kernel_build_dir/Module.supported
+%if ! %split_extra
+    cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
+%endif
+%else
+    (   cd %buildroot
+	find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
+    ) > %my_builddir/base-modules
+%endif
+    res=0
+    if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
+        # check for kabi changes
+        %_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
+            %my_builddir/kabi/%cpu_arch/symvers-%build_flavor \
+            Module.symvers || res=$?
+    fi
+    if [ $res -ne 0 ]; then
+	if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
+	     ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
+	    echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
+		 "directory to build this kernel even though its badness is" \
+		 "higher than allowed for an official kernel."
+	   exit 1
+	fi
+    fi
+    tar cf - -T %my_builddir/obj-files | \
+	tar xf - -C %rpm_install_dir/%cpu_arch_flavor
+    # bnc#507084
+    find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
+        while read f; do
+            case "$(file -b "$f")" in
+            ELF\ *\ executable*)
+                strip "$f"
+            esac
+        done
+    # Replace the absolute with a relative path
+    sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
+	%rpm_install_dir/%cpu_arch_flavor/Makefile
+fi
+add_dirs_to_filelist() {
+    sed -rn '
+        # print file name
+        p
+        # remove filelist macros
+        s:%%[a-z]+(\([^)]+\))? ?::g
+        # add %%dir prefix
+        s:^:%%dir :
+        # print all parents
+        :a
+            # skip directories owned by other packages
+            s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
+            s:/[^/]+$::p
+        ta
+    ' "$@" | sort -u
+}
+# Collect the file lists.
+shopt -s nullglob
+> %my_builddir/kernel-devel.files
+for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
+				%buildroot/lib/modules/*/{build,source}; do
+	f=${file##%buildroot}
+	echo "$f" >> %my_builddir/kernel-devel.files
+done
+{   cd %buildroot
+    find boot \
+	\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
+	-type f -name 'vmlinux-*.provides' -prune -o \
+	-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
+        -type f -printf '/%%p\n'
+    # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
+    # the file gets removed when uninstalling the kernel.
+    echo '%%ghost /boot/initrd-%kernelrelease-kdump'
+    touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
+    if [ %CONFIG_MODULES = y ]; then
+	find lib/modules/%kernelrelease-%build_flavor \
+	    -type d -o \
+	    \( -path '*/modules.*' ! -path '*/modules.order' \
+	     ! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
+	       -o -name '*.ko' -prune -o -printf '/%%p\n'
+	cat %my_builddir/base-modules
+    fi
+    test -d lib/firmware/%kernelrelease-%build_flavor && \
+    find lib/firmware/%kernelrelease-%build_flavor \
+	-type d -o \
+	-printf '/%%p\n'
+    if [ -e .%_docdir/%name ]; then
+	echo "%%doc %_docdir/%name"
+    fi
+} | sort -u >%my_builddir/tmp
+cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
+    add_dirs_to_filelist >%my_builddir/kernel-base.files
+rm %my_builddir/tmp
+%if %split_base
+    add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
+	> %my_builddir/kernel-main.files
+%endif
+%if %split_extra
+    add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
+%endif
+# Hardlink duplicate files automatically (from package fdupes): It doesn't save
+# much, but it keeps rpmlint from breaking the package build.
+%fdupes $RPM_BUILD_ROOT
+
+%preun -f preun.sh
+
+%postun -f postun.sh
+
+%pre -f pre.sh
+
+%post -f post.sh
+%if %split_base
+
+%files -f kernel-main.files
+%else
+
+%files -f kernel-base.files
+%endif
+%defattr(-, root, root)
+
+%package base
+Summary:        The Xen Kernel - base modules
+License:        GPLv2
+Group:          System/Kernel
+Url:            http://www.kernel.org/
+AutoReqProv:    on
+Provides:       multiversion(kernel)
+Provides:       kernel-base = %version-%source_rel
+Requires(pre):  coreutils awk
+Requires(post): module-init-tools
+Requires(post): perl-Bootloader
+Requires(post): mkinitrd
+%ifarch %ix86
+Conflicts:      libc.so.6()(64bit)
+%endif
+
+%description base
+The Linux kernel for Xen paravirtualization.
+
+This kernel can be used both as the domain0 ("xen0") and as an
+unprivileged ("xenU") kernel.
+
+This package contains only the base modules, required in all installs.
+
+
+%source_timestamp
+%preun base -f preun-base.sh
+
+%postun base -f postun-base.sh
+
+%pre base -f pre-base.sh
+
+%post base -f post-base.sh
+%if %split_base
+
+%files base -f kernel-base.files
+%defattr(-, root, root)
+%endif
+
+%package extra
+Summary:        The Xen Kernel - Unsupported kernel modules
+License:        GPLv2
+Group:          System/Kernel
+Url:            http://www.kernel.org/
+AutoReqProv:    on
+Provides:       multiversion(kernel)
+Provides:       %name-extra_%_target_cpu = %version-%release
+Provides:       kernel-extra = %version-%source_rel
+Requires:       %{name}_%_target_cpu = %version-%release
+Requires(pre):  coreutils awk
+Requires(post): module-init-tools
+Requires(post): perl-Bootloader
+Requires(post): mkinitrd
+Supplements:    packageand(product(SUSE_SLED):%{name}_%_target_cpu)
+%ifarch %ix86
+Conflicts:      libc.so.6()(64bit)
+%endif
+
+%description extra
+The Linux kernel for Xen paravirtualization.
+
+This kernel can be used both as the domain0 ("xen0") and as an
+unprivileged ("xenU") kernel.
+
+This package contains additional modules not supported by Novell.
+
+
+%source_timestamp
+%preun extra -f preun-extra.sh
+
+%postun extra -f postun-extra.sh
+
+%pre extra -f pre-extra.sh
+
+%post extra -f post-extra.sh
+%if %split_extra
+
+%files extra -f kernel-extra.files
+%defattr(-, root, root)
+%endif
+%if %CONFIG_KMSG_IDS == "y"
+
+%package man
+Summary:        The collection of man pages generated by the kmsg script.
+License:        GPLv2
+Group:          System/Kernel
+
+%description man
+This package includes the man pages that have been generated from the
+kmsg message documentation comments.
+
+
+%source_timestamp
+%files man
+%defattr(-,root,root)
+/usr/share/man/man9/*
+%endif
+
+%package devel
+Summary:        Development files necessary for building kernel modules
+License:        GPLv2
+Group:          Development/Sources
+Provides:       multiversion(kernel)
+Provides:       %name-devel = %version-%source_rel
+Requires:       kernel-source%variant = %version-%source_rel
+Supplements:    packageand(%name:kernel-source)
+AutoReqProv:    on
+
+%description devel
+This package contains files necessary for building kernel modules (and
+kernel module packages) against the %build_flavor flavor of the kernel.
+
+
+%source_timestamp
+%if %CONFIG_MODULES == "y"
+
+%pre devel -f devel-pre.sh
+
+%post devel -f devel-post.sh
+
+%files devel -f kernel-devel.files
+%defattr(-,root,root)
+%dir %obj_install_dir
+%dir %obj_install_dir/%cpu_arch
+%dir /usr/src/linux-obj
+%dir /usr/src/linux-obj/%cpu_arch
+%ghost /usr/src/linux-obj/%cpu_arch_flavor
+%obj_install_dir/%cpu_arch_flavor
+%if %_target_cpu != %cpu_arch
+%obj_install_dir/%_target_cpu
+/usr/src/linux-obj/%_target_cpu
+%endif
+%endif
+
+%package devel-debuginfo
+# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
+Summary:        Debug information for package %name-devel
+License:        GPLv2
+Group:          Development/Debug
+
+%description devel-debuginfo
+Debug information for package %name-devel
+
+
+%source_timestamp
+%files devel-debuginfo -f vmlinux.debug.files
+
+%changelog

patches.arch.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:82c1962b481cc6b8acd84205609bba3e7ea1eba57742f22dd5c50fbbe0681e87
+oid sha256:b6f0b727999cee7c42c69910639ffa8798965de12ebd7bfcd4c173e30d1f25e6
-size 98397
+size 95603

patches.drivers.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:07fb0573e5c37211121b407203590dadec59186da4b6d408889f41ef40e0b783
+oid sha256:08b098292304dae236697926cce5a58bd6150574e353af9dab62c91a538fb96e
-size 154102
+size 150991

patches.fixes.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:62d55b0c75bb847c54893d61c49a8c0771f80d138d8307eb449ada97e97210be
+oid sha256:31df01bfc844d49ddb89401bb44fde11534b0442296a4e4e6b95dc3082923ff9
-size 38989
+size 38373

patches.kernel.org.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7c8978008044b92120e40e4e9b840b38c8b32ed54b36db3aaf748363ba59faf
+oid sha256:daec28ef2f447b4272ddd79abcde9cadf1558834e41b9ad259ddd5271fd33f45
-size 10522777
+size 10630355

patches.rpmify.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d191871079b5790dc31ec9996b864f0c8bc68cadc55970fd4d3d5b030395af14
+oid sha256:2063a0541ed54383fbb0b116625ce21f7faaa3303337cd84b39521b445ae6578
-size 7763
+size 7519

patches.suse.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c454e2f82b14ec761dfae05c3e966473e2c03b742d7d250d8c7a066a9077c044
+oid sha256:97ced2bcaa3f62d8ebef3d4382c75fef5de0cea8439c4c6bc874df6681c07e30
-size 1075084
+size 1075559

patches.xen.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4bd03fde297c3b4b748ce8a976e6d3644d35850eea77b3861e2f0b4458335db1
+oid sha256:5e3a847ce3346c621bc481bf9b00451144c4e7babef02ebe19fd1fae61f779a2
-size 1900316
+size 1914144

series.conf

@@ -30,6 +30,7 @@
 	patches.kernel.org/patch-2.6.33-rc3
 	patches.kernel.org/patch-2.6.33-rc3-rc4
 	patches.kernel.org/patch-2.6.33-rc4-rc5
+	patches.kernel.org/patch-2.6.33-rc5-rc6
 
         ########################################################
         # Build fixes that apply to the vanilla kernel too.
@@ -46,7 +47,6 @@
 	patches.rpmify/rt2860-use-skb_tail_pointer
 	patches.rpmify/rtl8192e-use-skb_tail_pointer
 
-	patches.rpmify/smsc47m1-fix-section-mismatch
 	patches.rpmify/hugetlbfs-fix-section-mismatches
 	patches.rpmify/rtl8192e-fix-section-mismatches
 	patches.rpmify/dmar-fix-section-mismatch
@@ -107,7 +107,6 @@
 
 	# writable limits
 	patches.suse/rlim-0005-core-posix-cpu-timers-cleanup-rlimits-usage.patch
-	patches.suse/rlim-0008-SPARC-use-helpers-for-rlimits.patch
 	patches.suse/rlim-0009-X86-use-helpers-for-rlimits.patch
 	patches.suse/rlim-0010-FS-use-helpers-for-rlimits.patch
 	patches.suse/rlim-0011-MM-use-helpers-for-rlimits.patch
@@ -250,9 +249,6 @@
 
 	patches.arch/s390-05-13-qeth-blkt-defaults.patch
 
-	patches.arch/s390-06-01-zfcp-introduce-bsg-timeout-callback.patch
-+needs_update-33	patches.arch/s390-06-02-zfcp-set-hw-timeout-requested-by-bsg.patch
-
         ########################################################
         # VM/FS patches
         ########################################################
@@ -268,7 +264,7 @@
 	patches.suse/reiser4-set_page_dirty_notag
 	patches.suse/file-capabilities-disable-by-default.diff
 
-	patches.suse/files-slab-rcu.patch
++npiggin	patches.suse/files-slab-rcu.patch
 	patches.suse/mm-tune-dirty-limits.patch
 
 	patches.suse/mm-devzero-optimisation.patch
@@ -321,7 +317,6 @@
 	patches.arch/acpi_srat-pxm-rev-store.patch
 	patches.arch/acpi_srat-pxm-rev-ia64.patch
 	patches.arch/acpi_srat-pxm-rev-x86-64.patch
-	patches.arch/x86_node_hotplug_parse_srat_fix_2nd_ver.patch
 
 	########################################################
 	# CPUFREQ
@@ -527,12 +522,9 @@
 	patches.suse/fc-transport-allow-dev_loss_tmo-disable
 
 	patches.fixes/scsi-check-host-lookup-failure
-	patches.drivers/aacraid-24701-update
 	patches.drivers/lpfc-add-raywire-id
 	patches.drivers/megaraid-mbox-fix-SG_IO
 	patches.drivers/qla4xxx-5.01.00-k9-5.01.00.00.11.01-k10.patch
-	patches.fixes/aic79xx-null-scb-in-nonpkt-busfree
-	patches.fixes/scsi-fc-class-allow-LLD-bsg-timeout
 
 	# Remaining SCSI patches (garloff)
 	patches.suse/scsi-error-test-unit-ready-timeout
@@ -568,15 +560,13 @@
         patches.drivers/ixgbe-entropy-source.patch
         patches.drivers/tg3-entropy-source.patch
 
-	patches.drivers/sky2-optima-fix-pci-cfg
+	# qlge patches from 1.6.33 bnc#560420, fate#307130
-
-	# qlge patches from 2.6.33 bnc#560420, fate#307130
 	# These patches are not in 2.6.33 as of -rc3.
 	patches.drivers/qlge-0025-Add-performance-change-for-non-split-headers.patch
 	patches.drivers/qlge-0026-Add-firmware-core-dump.patch
 
-	patches.drivers/e1000-enhance-frame-fragment-detection.patch
++needs_update	patches.drivers/e1000-enhance-frame-fragment-detection.patch
-	patches.drivers/e1000e-enhance-frame-fragment-detection.patch
++needs_update	patches.drivers/e1000e-enhance-frame-fragment-detection.patch
 
 	########################################################
 	# Wireless Networking
@@ -618,10 +608,11 @@
 	##########################################################
 	# Sound
 	##########################################################
-	patches.drivers/alsa-sp1-hda-55-alc259-hp-pin-fix
-	patches.drivers/alsa-sp1-hda-56-realtek-eapd-fix
 	patches.drivers/alsa-sp1-hda-57-cx5051-toshiba-quirk
 	patches.drivers/alsa-sp1-hda-58-cx5051-lenovo-mute-fix
+	patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led
+	patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support
+	patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2
 
 	########################################################
 	# Other driver fixes
@@ -635,7 +626,6 @@
 	# Allow setting maximum number of raw devices
 	patches.suse/raw_device_max_minors_param.diff
 	patches.suse/no-partition-scan
-	patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch
 
 	########################################################
 	# Other drivers we have added to the tree
@@ -661,6 +651,7 @@
 	patches.fixes/dm-release-map_lock-before-set_disk_ro
 	patches.suse/dm-mpath-no-activate-for-offlined-paths
 	patches.suse/dm-mpath-no-partitions-feature
+	patches.fixes/dm-stripe-zero-stripes
 
 	########################################################
 	# md
@@ -840,115 +831,111 @@
 # re-basing to a newer xen tree.
 #
 	### both uml framebuffer and xen need this one.
-+xen_needs_update	patches.xen/add-console-use-vt
+	patches.xen/add-console-use-vt
 
 	# split out patches
-+xen_needs_update	patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch
+	patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch
-+xen_needs_update	patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch
+	patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch
-+xen_needs_update	patches.xen/ipv6-no-autoconf
+	patches.xen/ipv6-no-autoconf
-+xen_needs_update	patches.xen/pci-guestdev
+	patches.xen/pci-guestdev
-+xen_needs_update	patches.xen/pci-reserve
+	patches.xen/pci-reserve
-+xen_needs_update	patches.xen/sfc-driverlink
++needs_update-33	patches.xen/sfc-driverlink
-+xen_needs_update	patches.xen/sfc-resource-driver
++needs_update-33	patches.xen/sfc-resource-driver
-+xen_needs_update	patches.xen/sfc-driverlink-conditional
++needs_update-33	patches.xen/sfc-driverlink-conditional
-+xen_needs_update	patches.xen/sfc-external-sram
++needs_update-33	patches.xen/sfc-external-sram
-+xen_needs_update	patches.xen/tmem
+	patches.xen/tmem
 
 	# bulk stuff, new files for xen
-+xen_needs_update	patches.xen/xen3-auto-xen-arch.diff
+	patches.xen/xen3-auto-xen-arch.diff
-+xen_needs_update	patches.xen/xen3-auto-xen-drivers.diff
+	patches.xen/xen3-auto-xen-drivers.diff
-+xen_needs_update	patches.xen/xen3-auto-include-xen-interface.diff
+	patches.xen/xen3-auto-include-xen-interface.diff
 
 	# kconfig bits for xen
-+xen_needs_update	patches.xen/xen3-auto-xen-kconfig.diff
+	patches.xen/xen3-auto-xen-kconfig.diff
 
 	# common code changes
-+xen_needs_update	patches.xen/xen3-auto-common.diff
+	patches.xen/xen3-auto-common.diff
-+xen_needs_update	patches.xen/xen3-auto-arch-x86.diff
+	patches.xen/xen3-auto-arch-x86.diff
-+xen_needs_update	patches.xen/xen3-auto-arch-i386.diff
+	patches.xen/xen3-auto-arch-i386.diff
-+xen_needs_update	patches.xen/xen3-auto-arch-x86_64.diff
+	patches.xen/xen3-auto-arch-x86_64.diff
 
 	# fixups due to upstream Xen parts
-+xen_needs_update	patches.xen/xen3-fixup-xen
+	patches.xen/xen3-fixup-xen
 
-+xen_needs_update	patches.xen/sfc-set-arch
++needs_update-33	patches.xen/sfc-set-arch
-+xen_needs_update	patches.xen/sfc-endianness
++needs_update-33	patches.xen/sfc-endianness
 
 	# newer changeset backports
 
 	# changes outside arch/{i386,x86_64}/xen
-+xen_needs_update	patches.xen/xen3-fixup-kconfig
+	patches.xen/xen3-fixup-kconfig
-+xen_needs_update	patches.xen/xen3-fixup-common
+	patches.xen/xen3-fixup-common
-+xen_needs_update	patches.xen/xen3-fixup-arch-x86
+	patches.xen/xen3-fixup-arch-x86
 
 	# ports of other patches
-+xen_needs_update	patches.xen/xen3-patch-2.6.18
+	patches.xen/xen3-patch-2.6.18
-+xen_needs_update	patches.xen/xen3-patch-2.6.19
+	patches.xen/xen3-patch-2.6.19
-+xen_needs_update	patches.xen/xen3-patch-2.6.20
+	patches.xen/xen3-patch-2.6.20
-+xen_needs_update	patches.xen/xen3-patch-2.6.21
+	patches.xen/xen3-patch-2.6.21
-+xen_needs_update	patches.xen/xen3-patch-2.6.22
+	patches.xen/xen3-patch-2.6.22
-+xen_needs_update	patches.xen/xen3-patch-2.6.23
+	patches.xen/xen3-patch-2.6.23
-+xen_needs_update	patches.xen/xen3-patch-2.6.24
+	patches.xen/xen3-patch-2.6.24
-+xen_needs_update	patches.xen/xen3-patch-2.6.25
+	patches.xen/xen3-patch-2.6.25
-+xen_needs_update	patches.xen/xen3-patch-2.6.26
+	patches.xen/xen3-patch-2.6.26
-+xen_needs_update	patches.xen/xen3-patch-2.6.27
+	patches.xen/xen3-patch-2.6.27
-+xen_needs_update	patches.xen/xen3-patch-2.6.28
+	patches.xen/xen3-patch-2.6.28
-+xen_needs_update	patches.xen/xen3-patch-2.6.29
+	patches.xen/xen3-patch-2.6.29
-+xen_needs_update	patches.xen/xen3-patch-2.6.30
+	patches.xen/xen3-patch-2.6.30
-+xen_needs_update	patches.xen/xen3-patch-2.6.31
+	patches.xen/xen3-patch-2.6.31
-+xen_needs_update	patches.xen/xen3-patch-2.6.32
+	patches.xen/xen3-patch-2.6.32
-+xen_needs_update	patches.xen/xen3-patch-2.6.32.1-2
+	patches.xen/xen3-patch-2.6.33-rc3
-+xen_needs_update	patches.xen/xen3-patch-2.6.32.2-3
+	patches.xen/xen3-patch-2.6.33-rc3-rc4
-+xen_needs_update	patches.xen/xen3-patch-2.6.32.3-4
+	patches.xen/xen3-patch-2.6.33-rc4-rc5
-+xen_needs_update	patches.xen/xen3-seccomp-disable-tsc-option
+	patches.xen/xen3-patch-2.6.33-rc5-rc6
-+xen_needs_update	patches.xen/xen3-x86-mcp51-no-dac
+	patches.xen/xen3-seccomp-disable-tsc-option
-+xen_needs_update	patches.xen/xen3-x86-64-preserve-large-page-mapping-for-1st-2mb-kernel-txt-with-config_debug_rodata
+	patches.xen/xen3-x86-mcp51-no-dac
-+xen_needs_update	patches.xen/xen3-x86-64-align-rodata-kernel-section-to-2mb-with-config_debug_rodata
+	patches.xen/xen3-x86-mark_rodata_rw.patch
-+xen_needs_update	patches.xen/xen3-x86-mark_rodata_rw.patch
+	patches.xen/xen3-kdb-x86
-+xen_needs_update	patches.xen/xen3-x86-Remove-CPU-cache-size-output-for-non-Intel-too.patch
+	patches.xen/xen3-stack-unwind
-+xen_needs_update	patches.xen/xen3-x86-cpu-mv-display_cacheinfo-cpu_detect_cache_sizes.patch
+	patches.xen/xen3-x86_64-unwind-annotations
-+xen_needs_update	patches.xen/xen3-x86-Limit-the-number-of-processor-bootup-messages.patch
-+xen_needs_update	patches.xen/xen3-vmw_pvscsi-scsi-driver-for-vmware-s-virtual-hba.patch
-+xen_needs_update	patches.xen/xen3-kdb-x86
-+xen_needs_update	patches.xen/xen3-stack-unwind
-+xen_needs_update	patches.xen/xen3-x86_64-unwind-annotations
 
 	# bugfixes and enhancements
-+xen_needs_update	patches.xen/xen-balloon-max-target
+	patches.xen/xen-balloon-max-target
-+xen_needs_update	patches.xen/xen-modular-blktap
+	patches.xen/xen-modular-blktap
-+xen_needs_update	patches.xen/xen-blkback-bimodal-suse
+	patches.xen/xen-blkback-bimodal-suse
-+xen_needs_update	patches.xen/xen-blkif-protocol-fallback-hack
+	patches.xen/xen-blkif-protocol-fallback-hack
-+xen_needs_update	patches.xen/xen-blkback-cdrom
+	patches.xen/xen-blkback-cdrom
-+xen_needs_update	patches.xen/xen-blktap-write-barriers
+	patches.xen/xen-blktap-write-barriers
-+xen_needs_update	patches.xen/xen-op-packet
+	patches.xen/xen-op-packet
-+xen_needs_update	patches.xen/xen-blkfront-cdrom
+	patches.xen/xen-blkfront-cdrom
-+xen_needs_update	patches.xen/xen-sections
+	patches.xen/xen-sections
-+xen_needs_update	patches.xen/xen-swiotlb-heuristics
+	patches.xen/xen-swiotlb-heuristics
-+xen_needs_update	patches.xen/xen-kconfig-compat
+	patches.xen/xen-kconfig-compat
-+xen_needs_update	patches.xen/xen-cpufreq-report
+	patches.xen/xen-cpufreq-report
-+xen_needs_update	patches.xen/xen-staging-build
+	patches.xen/xen-staging-build
-+xen_needs_update	patches.xen/xen-sysdev-suspend
+	patches.xen/xen-sysdev-suspend
-+xen_needs_update	patches.xen/xen-ipi-per-cpu-irq
+	patches.xen/xen-ipi-per-cpu-irq
-+xen_needs_update	patches.xen/xen-virq-per-cpu-irq
+	patches.xen/xen-virq-per-cpu-irq
-+xen_needs_update	patches.xen/xen-spinlock-poll-early
+	patches.xen/xen-spinlock-poll-early
-+xen_needs_update	patches.xen/xen-configurable-guest-devices
+	patches.xen/xen-configurable-guest-devices
-+xen_needs_update	patches.xen/xen-netback-nr-irqs
+	patches.xen/xen-netback-nr-irqs
-+xen_needs_update	patches.xen/xen-netback-notify-multi
+	patches.xen/xen-netback-notify-multi
-+xen_needs_update	patches.xen/xen-pciback-sriov
+	patches.xen/xen-netback-generalize
-+xen_needs_update	patches.xen/xen-unpriv-build
+	patches.xen/xen-netback-multiple-tasklets
-+xen_needs_update	patches.xen/xen-vmalloc_32
+	patches.xen/xen-netback-kernel-threads
-+xen_needs_update	patches.xen/xen-dcdbas
+	patches.xen/xen-pciback-sriov
-+xen_needs_update	patches.xen/xen-privcmd-mmap-batch-clear
+	patches.xen/xen-unpriv-build
-+xen_needs_update	patches.xen/xen-x86-panic-no-reboot
+	patches.xen/xen-dcdbas
-+xen_needs_update	patches.xen/xen-x86-dcr-fallback
+	patches.xen/xen-x86-panic-no-reboot
-+xen_needs_update	patches.xen/xen-x86-consistent-nmi
+	patches.xen/xen-x86-dcr-fallback
-+xen_needs_update	patches.xen/xen-x86-no-lapic
+	patches.xen/xen-x86-consistent-nmi
-+xen_needs_update	patches.xen/xen-x86-pmd-handling
+	patches.xen/xen-x86-no-lapic
-+xen_needs_update	patches.xen/xen-x86-bigmem
+	patches.xen/xen-x86-pmd-handling
-+xen_needs_update	patches.xen/xen-x86-machphys-prediction
+	patches.xen/xen-x86-bigmem
-+xen_needs_update	patches.xen/xen-x86-exit-mmap
+	patches.xen/xen-x86-machphys-prediction
-+xen_needs_update	patches.xen/xen-x86-per-cpu-vcpu-info
+	patches.xen/xen-x86-exit-mmap
-+xen_needs_update	patches.xen/xen-x86_64-pgd-pin
+	patches.xen/xen-x86-per-cpu-vcpu-info
-+xen_needs_update	patches.xen/xen-x86_64-pgd-alloc-order
+	patches.xen/xen-x86_64-pgd-pin
-+xen_needs_update	patches.xen/xen-x86_64-dump-user-pgt
+	patches.xen/xen-x86_64-pgd-alloc-order
-+xen_needs_update	patches.xen/xen-x86_64-note-init-p2m
+	patches.xen/xen-x86_64-dump-user-pgt
+	patches.xen/xen-x86_64-note-init-p2m

source-timestamp

@@ -1,3 +1,3 @@
-2010-01-27 14:55:38 +0100
+2010-02-04 13:24:08 +0100
-GIT Revision: 2b3dccc0787e3003e55784678dcf8aa5c6503f95
+GIT Revision: 69aad1a30e31d4f33ab56a1f195c7c4229c9dd66
 GIT Branch: master

supported.conf

@@ -106,6 +106,7 @@
 		kernel/crypto/ecb
 		kernel/crypto/eseqiv
 		kernel/crypto/fcrypt
+		kernel/crypto/hmac
 		kernel/crypto/gcm
 		kernel/crypto/gf128mul
 		kernel/crypto/crypto_hash
@@ -2462,7 +2463,7 @@
 		kernel/net/sched/cls_rsvp6
 		kernel/net/sched/cls_tcindex
 		kernel/net/sched/cls_u32
--		kernel/net/sched/em_cmp
+		kernel/net/sched/em_cmp
 -		kernel/net/sched/em_meta
 -		kernel/net/sched/em_nbyte
 -		kernel/net/sched/em_text
@@ -2588,6 +2589,7 @@
 +isa		kernel/sound/isa/snd-sgalaxy
 +isa		kernel/sound/isa/snd-sscape
 +isa		kernel/sound/isa/wavefront/snd-wavefront
++isa		kernel/sound/isa/wss/snd-wss-lib
 -		kernel/sound/oss/ad1848
 -		kernel/sound/oss/aedsp16				# Audio Excel DSP 16 Driver Version 1.3
 -		kernel/sound/oss/kahlua					# Kahlua VSA1 PCI Audio