From 3a0f45f551938329e7a0b3e97c100d6a16ef0d74efa536369b10ba097b6d61a7 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Thu, 2 Jun 2011 05:02:33 +0000 Subject: [PATCH] GIT Revision: a144c738b174d2bb3cb06c2711aa1fe2ad7a94aa OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=6979 --- kernel-debug.changes | 6 ++++++ kernel-debug.spec | 3 +++ kernel-default.changes | 6 ++++++ kernel-default.spec | 3 +++ kernel-desktop.changes | 6 ++++++ kernel-desktop.spec | 3 +++ kernel-docs.changes | 6 ++++++ kernel-docs.spec | 3 +++ kernel-ec2.changes | 6 ++++++ kernel-ec2.spec | 3 +++ kernel-pae.changes | 6 ++++++ kernel-pae.spec | 3 +++ kernel-ppc64.changes | 6 ++++++ kernel-ppc64.spec | 3 +++ kernel-ps3.changes | 6 ++++++ kernel-ps3.spec | 3 +++ kernel-s390.changes | 6 ++++++ kernel-s390.spec | 3 +++ kernel-source.changes | 6 ++++++ kernel-source.spec | 3 +++ kernel-syms.changes | 6 ++++++ kernel-syms.spec | 3 +++ kernel-trace.changes | 6 ++++++ kernel-trace.spec | 3 +++ kernel-vanilla.changes | 6 ++++++ kernel-vanilla.spec | 3 +++ kernel-xen.changes | 6 ++++++ kernel-xen.spec | 3 +++ patches.xen.tar.bz2 | 4 ++-- series.conf | 7 ------- source-timestamp | 4 ++-- 31 files changed, 130 insertions(+), 11 deletions(-) diff --git a/kernel-debug.changes b/kernel-debug.changes index 34f4191..bc96949 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 1 10:02:24 CEST 2011 - jbeulich@novell.com + +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 + ------------------------------------------------------------------- Tue May 31 05:09:44 CEST 2011 - jeffm@suse.com diff --git a/kernel-debug.spec b/kernel-debug.spec index bb1fef3..766d17b 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -879,6 +879,9 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Jun 01 2011 jbeulich@novell.com +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 * Tue May 31 2011 jeffm@suse.com - Revert "- Updated to 3.0-rc1." This reverts commit 5710413eb834b0f215f6f4249d6ff7c3f7673eb7. diff --git a/kernel-default.changes b/kernel-default.changes index 34f4191..bc96949 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 1 10:02:24 CEST 2011 - jbeulich@novell.com + +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 + ------------------------------------------------------------------- Tue May 31 05:09:44 CEST 2011 - jeffm@suse.com diff --git a/kernel-default.spec b/kernel-default.spec index 65a965b..e743182 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -892,6 +892,9 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Jun 01 2011 jbeulich@novell.com +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 * Tue May 31 2011 jeffm@suse.com - Revert "- Updated to 3.0-rc1." This reverts commit 5710413eb834b0f215f6f4249d6ff7c3f7673eb7. diff --git a/kernel-desktop.changes b/kernel-desktop.changes index 34f4191..bc96949 100644 --- a/kernel-desktop.changes +++ b/kernel-desktop.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 1 10:02:24 CEST 2011 - jbeulich@novell.com + +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 + ------------------------------------------------------------------- Tue May 31 05:09:44 CEST 2011 - jeffm@suse.com diff --git a/kernel-desktop.spec b/kernel-desktop.spec index 97fc668..10bbcd6 100644 --- a/kernel-desktop.spec +++ b/kernel-desktop.spec @@ -912,6 +912,9 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Jun 01 2011 jbeulich@novell.com +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 * Tue May 31 2011 jeffm@suse.com - Revert "- Updated to 3.0-rc1." This reverts commit 5710413eb834b0f215f6f4249d6ff7c3f7673eb7. diff --git a/kernel-docs.changes b/kernel-docs.changes index 34f4191..bc96949 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 1 10:02:24 CEST 2011 - jbeulich@novell.com + +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 + ------------------------------------------------------------------- Tue May 31 05:09:44 CEST 2011 - jeffm@suse.com diff --git a/kernel-docs.spec b/kernel-docs.spec index 1dc25d8..68f66fd 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT /usr/share/doc/kernel %changelog +* Wed Jun 01 2011 jbeulich@novell.com +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 * Tue May 31 2011 jeffm@suse.com - Revert "- Updated to 3.0-rc1." This reverts commit 5710413eb834b0f215f6f4249d6ff7c3f7673eb7. diff --git a/kernel-ec2.changes b/kernel-ec2.changes index 34f4191..bc96949 100644 --- a/kernel-ec2.changes +++ b/kernel-ec2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 1 10:02:24 CEST 2011 - jbeulich@novell.com + +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 + ------------------------------------------------------------------- Tue May 31 05:09:44 CEST 2011 - jeffm@suse.com diff --git a/kernel-ec2.spec b/kernel-ec2.spec index 8362791..68c9f58 100644 --- a/kernel-ec2.spec +++ b/kernel-ec2.spec @@ -882,6 +882,9 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Jun 01 2011 jbeulich@novell.com +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 * Tue May 31 2011 jeffm@suse.com - Revert "- Updated to 3.0-rc1." This reverts commit 5710413eb834b0f215f6f4249d6ff7c3f7673eb7. diff --git a/kernel-pae.changes b/kernel-pae.changes index 34f4191..bc96949 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 1 10:02:24 CEST 2011 - jbeulich@novell.com + +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 + ------------------------------------------------------------------- Tue May 31 05:09:44 CEST 2011 - jeffm@suse.com diff --git a/kernel-pae.spec b/kernel-pae.spec index cee5cdd..95ccc27 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -897,6 +897,9 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Jun 01 2011 jbeulich@novell.com +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 * Tue May 31 2011 jeffm@suse.com - Revert "- Updated to 3.0-rc1." This reverts commit 5710413eb834b0f215f6f4249d6ff7c3f7673eb7. diff --git a/kernel-ppc64.changes b/kernel-ppc64.changes index 34f4191..bc96949 100644 --- a/kernel-ppc64.changes +++ b/kernel-ppc64.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 1 10:02:24 CEST 2011 - jbeulich@novell.com + +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 + ------------------------------------------------------------------- Tue May 31 05:09:44 CEST 2011 - jeffm@suse.com diff --git a/kernel-ppc64.spec b/kernel-ppc64.spec index 645aa43..8f12917 100644 --- a/kernel-ppc64.spec +++ b/kernel-ppc64.spec @@ -901,6 +901,9 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Jun 01 2011 jbeulich@novell.com +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 * Tue May 31 2011 jeffm@suse.com - Revert "- Updated to 3.0-rc1." This reverts commit 5710413eb834b0f215f6f4249d6ff7c3f7673eb7. diff --git a/kernel-ps3.changes b/kernel-ps3.changes index 34f4191..bc96949 100644 --- a/kernel-ps3.changes +++ b/kernel-ps3.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 1 10:02:24 CEST 2011 - jbeulich@novell.com + +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 + ------------------------------------------------------------------- Tue May 31 05:09:44 CEST 2011 - jeffm@suse.com diff --git a/kernel-ps3.spec b/kernel-ps3.spec index ff1b35b..24743af 100644 --- a/kernel-ps3.spec +++ b/kernel-ps3.spec @@ -882,6 +882,9 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Jun 01 2011 jbeulich@novell.com +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 * Tue May 31 2011 jeffm@suse.com - Revert "- Updated to 3.0-rc1." This reverts commit 5710413eb834b0f215f6f4249d6ff7c3f7673eb7. diff --git a/kernel-s390.changes b/kernel-s390.changes index 34f4191..bc96949 100644 --- a/kernel-s390.changes +++ b/kernel-s390.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 1 10:02:24 CEST 2011 - jbeulich@novell.com + +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 + ------------------------------------------------------------------- Tue May 31 05:09:44 CEST 2011 - jeffm@suse.com diff --git a/kernel-s390.spec b/kernel-s390.spec index ff349a9..d5744ce 100644 --- a/kernel-s390.spec +++ b/kernel-s390.spec @@ -876,6 +876,9 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Jun 01 2011 jbeulich@novell.com +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 * Tue May 31 2011 jeffm@suse.com - Revert "- Updated to 3.0-rc1." This reverts commit 5710413eb834b0f215f6f4249d6ff7c3f7673eb7. diff --git a/kernel-source.changes b/kernel-source.changes index 34f4191..bc96949 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 1 10:02:24 CEST 2011 - jbeulich@novell.com + +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 + ------------------------------------------------------------------- Tue May 31 05:09:44 CEST 2011 - jeffm@suse.com diff --git a/kernel-source.spec b/kernel-source.spec index 6751340..fee7c00 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -255,6 +255,9 @@ find %buildroot/usr/src/linux* ! -type l | xargs touch -d "$ts" %endif %changelog +* Wed Jun 01 2011 jbeulich@novell.com +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 * Tue May 31 2011 jeffm@suse.com - Revert "- Updated to 3.0-rc1." This reverts commit 5710413eb834b0f215f6f4249d6ff7c3f7673eb7. diff --git a/kernel-syms.changes b/kernel-syms.changes index 34f4191..bc96949 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 1 10:02:24 CEST 2011 - jbeulich@novell.com + +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 + ------------------------------------------------------------------- Tue May 31 05:09:44 CEST 2011 - jeffm@suse.com diff --git a/kernel-syms.spec b/kernel-syms.spec index 29b861e..5dbd4a6 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -81,6 +81,9 @@ install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE %_docdir/%name/README.SUSE %changelog +* Wed Jun 01 2011 jbeulich@novell.com +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 * Tue May 31 2011 jeffm@suse.com - Revert "- Updated to 3.0-rc1." This reverts commit 5710413eb834b0f215f6f4249d6ff7c3f7673eb7. diff --git a/kernel-trace.changes b/kernel-trace.changes index 34f4191..bc96949 100644 --- a/kernel-trace.changes +++ b/kernel-trace.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 1 10:02:24 CEST 2011 - jbeulich@novell.com + +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 + ------------------------------------------------------------------- Tue May 31 05:09:44 CEST 2011 - jeffm@suse.com diff --git a/kernel-trace.spec b/kernel-trace.spec index fb5aaa9..8d231a9 100644 --- a/kernel-trace.spec +++ b/kernel-trace.spec @@ -884,6 +884,9 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Jun 01 2011 jbeulich@novell.com +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 * Tue May 31 2011 jeffm@suse.com - Revert "- Updated to 3.0-rc1." This reverts commit 5710413eb834b0f215f6f4249d6ff7c3f7673eb7. diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 34f4191..bc96949 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 1 10:02:24 CEST 2011 - jbeulich@novell.com + +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 + ------------------------------------------------------------------- Tue May 31 05:09:44 CEST 2011 - jeffm@suse.com diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index a9fbfc0..9ce47a5 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -880,6 +880,9 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Jun 01 2011 jbeulich@novell.com +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 * Tue May 31 2011 jeffm@suse.com - Revert "- Updated to 3.0-rc1." This reverts commit 5710413eb834b0f215f6f4249d6ff7c3f7673eb7. diff --git a/kernel-xen.changes b/kernel-xen.changes index 34f4191..bc96949 100644 --- a/kernel-xen.changes +++ b/kernel-xen.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 1 10:02:24 CEST 2011 - jbeulich@novell.com + +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 + ------------------------------------------------------------------- Tue May 31 05:09:44 CEST 2011 - jeffm@suse.com diff --git a/kernel-xen.spec b/kernel-xen.spec index 9e6ff82..5c0eada 100644 --- a/kernel-xen.spec +++ b/kernel-xen.spec @@ -882,6 +882,9 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Jun 01 2011 jbeulich@novell.com +- Delete patches.xen/sfc-* (as advised by Solarflare). +- commit a144c73 * Tue May 31 2011 jeffm@suse.com - Revert "- Updated to 3.0-rc1." This reverts commit 5710413eb834b0f215f6f4249d6ff7c3f7673eb7. diff --git a/patches.xen.tar.bz2 b/patches.xen.tar.bz2 index b0f554e..247ffcf 100644 --- a/patches.xen.tar.bz2 +++ b/patches.xen.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56ac59940c27127c3709ededef1b612665f0b6eec747e4d8128bb4d244b8a72c -size 2115410 +oid sha256:fb23ab1b6bc2dcd2a73dad38dc7c0941da174864bea10f979b2c2620ad277c7b +size 2028696 diff --git a/series.conf b/series.conf index d491d56..cd71099 100644 --- a/series.conf +++ b/series.conf @@ -565,10 +565,6 @@ patches.xen/ipv6-no-autoconf patches.xen/pci-guestdev patches.xen/pci-reserve -+needs_update-33 patches.xen/sfc-driverlink -+needs_update-33 patches.xen/sfc-resource-driver -+needs_update-33 patches.xen/sfc-driverlink-conditional -+needs_update-33 patches.xen/sfc-external-sram patches.xen/tmem # bulk stuff, new files for xen @@ -589,9 +585,6 @@ # fixups due to upstream Xen parts patches.xen/xen3-fixup-xen -+needs_update-33 patches.xen/sfc-set-arch -+needs_update-33 patches.xen/sfc-endianness - # newer changeset backports # changes outside arch/{i386,x86_64}/xen diff --git a/source-timestamp b/source-timestamp index f065a1c..32a2e00 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2011-05-31 05:09:44 +0200 -GIT Revision: b2d9e72dc9cd8e62d49e0565babd76332f7c2114 +2011-06-01 10:02:24 +0200 +GIT Revision: a144c738b174d2bb3cb06c2711aa1fe2ad7a94aa GIT Branch: master