From 45894f2f100de3e41815ed4743cf10ac6e7be37c6596e50d09bde0a7332cf26e Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Fri, 13 Dec 2013 07:01:48 +0000 Subject: [PATCH] commit 2bf5161e2914c183cc732cb00e9668aa0342d296 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=7682 --- config.conf | 3 --- kernel-debug.changes | 16 ++++++++++++++++ kernel-debug.spec | 2 +- kernel-default.changes | 16 ++++++++++++++++ kernel-default.spec | 2 +- kernel-desktop.changes | 16 ++++++++++++++++ kernel-desktop.spec | 2 +- kernel-docs.changes | 16 ++++++++++++++++ kernel-docs.spec | 2 +- kernel-pae.changes | 16 ++++++++++++++++ kernel-pae.spec | 2 +- kernel-source.changes | 16 ++++++++++++++++ kernel-source.spec | 2 +- kernel-syms.changes | 16 ++++++++++++++++ kernel-syms.spec | 2 +- kernel-trace.changes | 16 ++++++++++++++++ kernel-trace.spec | 2 +- kernel-vanilla.changes | 16 ++++++++++++++++ kernel-vanilla.spec | 2 +- patches.suse.tar.bz2 | 4 ++-- series.conf | 1 - series.confe | 1 - source-timestamp | 4 ++-- 23 files changed, 157 insertions(+), 18 deletions(-) diff --git a/config.conf b/config.conf index 5d018b15..820e57bf 100644 --- a/config.conf +++ b/config.conf @@ -45,9 +45,6 @@ #+armv7hl armv7hl/exynos #+arm64 arm64/default -#+s390 s390/s390 -#+s390 -syms s390/trace -#+s390 s390/vanilla +s390x s390x/default +s390x -syms s390x/trace +s390x s390x/vanilla diff --git a/kernel-debug.changes b/kernel-debug.changes index 59527724..775d880d 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Dec 12 13:53:00 CET 2013 - jdelvare@suse.de + +- config.conf: s390 is history +- Delete config/s390/s390. +- Delete config/s390/trace. +- Delete config/s390/vanilla. +- commit 2bf5161 + +------------------------------------------------------------------- +Thu Dec 12 10:24:11 CET 2013 - jdelvare@suse.de + +- Delete patches.suse/ida-remove-warning-dump-stack.patch. + Already included since kernel 3.11 (WARN calls dump_stack.) +- commit 8e04564 + ------------------------------------------------------------------- Mon Dec 9 12:40:58 CET 2013 - hare@suse.de diff --git a/kernel-debug.spec b/kernel-debug.spec index b4eedb0e..25640bfc 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -61,7 +61,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel Version: 3.13.rc3 %if 0%{?is_kotd} -Release: .g44df1ce +Release: .g2bf5161 %else Release: 0 %endif diff --git a/kernel-default.changes b/kernel-default.changes index 59527724..775d880d 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Dec 12 13:53:00 CET 2013 - jdelvare@suse.de + +- config.conf: s390 is history +- Delete config/s390/s390. +- Delete config/s390/trace. +- Delete config/s390/vanilla. +- commit 2bf5161 + +------------------------------------------------------------------- +Thu Dec 12 10:24:11 CET 2013 - jdelvare@suse.de + +- Delete patches.suse/ida-remove-warning-dump-stack.patch. + Already included since kernel 3.11 (WARN calls dump_stack.) +- commit 8e04564 + ------------------------------------------------------------------- Mon Dec 9 12:40:58 CET 2013 - hare@suse.de diff --git a/kernel-default.spec b/kernel-default.spec index ee52da97..cac219ce 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -61,7 +61,7 @@ Name: kernel-default Summary: The Standard Kernel Version: 3.13.rc3 %if 0%{?is_kotd} -Release: .g44df1ce +Release: .g2bf5161 %else Release: 0 %endif diff --git a/kernel-desktop.changes b/kernel-desktop.changes index 59527724..775d880d 100644 --- a/kernel-desktop.changes +++ b/kernel-desktop.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Dec 12 13:53:00 CET 2013 - jdelvare@suse.de + +- config.conf: s390 is history +- Delete config/s390/s390. +- Delete config/s390/trace. +- Delete config/s390/vanilla. +- commit 2bf5161 + +------------------------------------------------------------------- +Thu Dec 12 10:24:11 CET 2013 - jdelvare@suse.de + +- Delete patches.suse/ida-remove-warning-dump-stack.patch. + Already included since kernel 3.11 (WARN calls dump_stack.) +- commit 8e04564 + ------------------------------------------------------------------- Mon Dec 9 12:40:58 CET 2013 - hare@suse.de diff --git a/kernel-desktop.spec b/kernel-desktop.spec index 4fe46ee5..ac1581e2 100644 --- a/kernel-desktop.spec +++ b/kernel-desktop.spec @@ -61,7 +61,7 @@ Name: kernel-desktop Summary: Kernel optimized for the desktop Version: 3.13.rc3 %if 0%{?is_kotd} -Release: .g44df1ce +Release: .g2bf5161 %else Release: 0 %endif diff --git a/kernel-docs.changes b/kernel-docs.changes index 59527724..775d880d 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Dec 12 13:53:00 CET 2013 - jdelvare@suse.de + +- config.conf: s390 is history +- Delete config/s390/s390. +- Delete config/s390/trace. +- Delete config/s390/vanilla. +- commit 2bf5161 + +------------------------------------------------------------------- +Thu Dec 12 10:24:11 CET 2013 - jdelvare@suse.de + +- Delete patches.suse/ida-remove-warning-dump-stack.patch. + Already included since kernel 3.11 (WARN calls dump_stack.) +- commit 8e04564 + ------------------------------------------------------------------- Mon Dec 9 12:40:58 CET 2013 - hare@suse.de diff --git a/kernel-docs.spec b/kernel-docs.spec index 6de09498..a55bc620 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -26,7 +26,7 @@ Name: kernel-docs Summary: Kernel Documentation Version: 3.13.rc3 %if 0%{?is_kotd} -Release: .g44df1ce +Release: .g2bf5161 %else Release: 0 %endif diff --git a/kernel-pae.changes b/kernel-pae.changes index 59527724..775d880d 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Dec 12 13:53:00 CET 2013 - jdelvare@suse.de + +- config.conf: s390 is history +- Delete config/s390/s390. +- Delete config/s390/trace. +- Delete config/s390/vanilla. +- commit 2bf5161 + +------------------------------------------------------------------- +Thu Dec 12 10:24:11 CET 2013 - jdelvare@suse.de + +- Delete patches.suse/ida-remove-warning-dump-stack.patch. + Already included since kernel 3.11 (WARN calls dump_stack.) +- commit 8e04564 + ------------------------------------------------------------------- Mon Dec 9 12:40:58 CET 2013 - hare@suse.de diff --git a/kernel-pae.spec b/kernel-pae.spec index 3834e29b..7eb663e2 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -61,7 +61,7 @@ Name: kernel-pae Summary: Kernel with PAE Support Version: 3.13.rc3 %if 0%{?is_kotd} -Release: .g44df1ce +Release: .g2bf5161 %else Release: 0 %endif diff --git a/kernel-source.changes b/kernel-source.changes index 59527724..775d880d 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Dec 12 13:53:00 CET 2013 - jdelvare@suse.de + +- config.conf: s390 is history +- Delete config/s390/s390. +- Delete config/s390/trace. +- Delete config/s390/vanilla. +- commit 2bf5161 + +------------------------------------------------------------------- +Thu Dec 12 10:24:11 CET 2013 - jdelvare@suse.de + +- Delete patches.suse/ida-remove-warning-dump-stack.patch. + Already included since kernel 3.11 (WARN calls dump_stack.) +- commit 8e04564 + ------------------------------------------------------------------- Mon Dec 9 12:40:58 CET 2013 - hare@suse.de diff --git a/kernel-source.spec b/kernel-source.spec index 38ab312c..3637110c 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -31,7 +31,7 @@ Name: kernel-source Summary: The Linux Kernel Sources Version: 3.13.rc3 %if 0%{?is_kotd} -Release: .g44df1ce +Release: .g2bf5161 %else Release: 0 %endif diff --git a/kernel-syms.changes b/kernel-syms.changes index 59527724..775d880d 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Dec 12 13:53:00 CET 2013 - jdelvare@suse.de + +- config.conf: s390 is history +- Delete config/s390/s390. +- Delete config/s390/trace. +- Delete config/s390/vanilla. +- commit 2bf5161 + +------------------------------------------------------------------- +Thu Dec 12 10:24:11 CET 2013 - jdelvare@suse.de + +- Delete patches.suse/ida-remove-warning-dump-stack.patch. + Already included since kernel 3.11 (WARN calls dump_stack.) +- commit 8e04564 + ------------------------------------------------------------------- Mon Dec 9 12:40:58 CET 2013 - hare@suse.de diff --git a/kernel-syms.spec b/kernel-syms.spec index add6169d..5c75eb68 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -26,7 +26,7 @@ Summary: Kernel Symbol Versions (modversions) Version: 3.13.rc3 %if %using_buildservice %if 0%{?is_kotd} -Release: .g44df1ce +Release: .g2bf5161 %else Release: 0 %endif diff --git a/kernel-trace.changes b/kernel-trace.changes index 59527724..775d880d 100644 --- a/kernel-trace.changes +++ b/kernel-trace.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Dec 12 13:53:00 CET 2013 - jdelvare@suse.de + +- config.conf: s390 is history +- Delete config/s390/s390. +- Delete config/s390/trace. +- Delete config/s390/vanilla. +- commit 2bf5161 + +------------------------------------------------------------------- +Thu Dec 12 10:24:11 CET 2013 - jdelvare@suse.de + +- Delete patches.suse/ida-remove-warning-dump-stack.patch. + Already included since kernel 3.11 (WARN calls dump_stack.) +- commit 8e04564 + ------------------------------------------------------------------- Mon Dec 9 12:40:58 CET 2013 - hare@suse.de diff --git a/kernel-trace.spec b/kernel-trace.spec index 5fdd3143..4b43d373 100644 --- a/kernel-trace.spec +++ b/kernel-trace.spec @@ -61,7 +61,7 @@ Name: kernel-trace Summary: The Standard Kernel with Tracing Features Version: 3.13.rc3 %if 0%{?is_kotd} -Release: .g44df1ce +Release: .g2bf5161 %else Release: 0 %endif diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 59527724..775d880d 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Dec 12 13:53:00 CET 2013 - jdelvare@suse.de + +- config.conf: s390 is history +- Delete config/s390/s390. +- Delete config/s390/trace. +- Delete config/s390/vanilla. +- commit 2bf5161 + +------------------------------------------------------------------- +Thu Dec 12 10:24:11 CET 2013 - jdelvare@suse.de + +- Delete patches.suse/ida-remove-warning-dump-stack.patch. + Already included since kernel 3.11 (WARN calls dump_stack.) +- commit 8e04564 + ------------------------------------------------------------------- Mon Dec 9 12:40:58 CET 2013 - hare@suse.de diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index ba998a4c..ce4f890c 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -61,7 +61,7 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches Version: 3.13.rc3 %if 0%{?is_kotd} -Release: .g44df1ce +Release: .g2bf5161 %else Release: 0 %endif diff --git a/patches.suse.tar.bz2 b/patches.suse.tar.bz2 index 211d25d7..99f45389 100644 --- a/patches.suse.tar.bz2 +++ b/patches.suse.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8958bf124b303ffe47c21c87b18302f8dcf56fe5054783bc9835c124992fc25f -size 127961 +oid sha256:8848571832e355c6b158148522573145b17a0b5e8c9da298f994e4c151ba9017 +size 127550 diff --git a/series.conf b/series.conf index b3a29a08..4c1185af 100644 --- a/series.conf +++ b/series.conf @@ -190,7 +190,6 @@ ######################################################## patches.suse/connector-read-mostly patches.suse/kbd-ignore-gfx.patch - patches.suse/ida-remove-warning-dump-stack.patch ######################################################## # diff --git a/series.confe b/series.confe index dffa8e3d..855b1f1d 100644 --- a/series.confe +++ b/series.confe @@ -190,7 +190,6 @@ ######################################################## patches.suse/connector-read-mostly patches.suse/kbd-ignore-gfx.patch - patches.suse/ida-remove-warning-dump-stack.patch ######################################################## # diff --git a/source-timestamp b/source-timestamp index 8c2993e8..3eef0869 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2013-12-09 12:40:58 +0100 -GIT Revision: 44df1cea6ad4bc65ec65e5ca098baa818c0ac8ee +2013-12-12 13:53:00 +0100 +GIT Revision: 2bf5161e2914c183cc732cb00e9668aa0342d296 GIT Branch: master