diff --git a/_constraints b/_constraints
index 30e1ac07..d3039e83 100644
--- a/_constraints
+++ b/_constraints
@@ -11,7 +11,6 @@
x86_64
kernel-debug
kernel-default
-kernel-desktop
kernel-ec2
kernel-lpae
kernel-pae
@@ -34,7 +33,6 @@
ppc64le
kernel-debug
kernel-default
-kernel-desktop
kernel-ec2
kernel-lpae
kernel-pae
diff --git a/config-options.changes.txt b/config-options.changes.txt
index 09b72fbc..239b7d0a 100644
--- a/config-options.changes.txt
+++ b/config-options.changes.txt
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Sep 25 20:35:38 UTC 2015 - mmarek@suse.com
+
+- Drop the -desktop flavors and merge these settings back to
+ i386/pae and x86_64/default, respectively:
+ - CONFIG_PREEMPT=y
+ - vm.dirty_ratio=20
+ The builtin driver choices of the desktop configs were discarded
+ and CONFIG_HZ is 250 (fate#319416).
+
-------------------------------------------------------------------
Fri Feb 13 14:58:32 CET 2015 - jdelvare@suse.de
diff --git a/config.conf b/config.conf
index cdd4714d..54dcd575 100644
--- a/config.conf
+++ b/config.conf
@@ -9,7 +9,6 @@
#
+i386 i386/default
-+i386 i386/desktop
+i386 i386/pae
+i386 i386/xen
+i386 -syms i386/ec2
@@ -18,7 +17,6 @@
+i386 i386/vanilla
+x86_64 x86_64/default
-+x86_64 x86_64/desktop
+x86_64 x86_64/xen
+x86_64 -syms x86_64/ec2
+x86_64 x86_64/pv
diff --git a/config.tar.bz2 b/config.tar.bz2
index 746f32d9..cff21237 100644
--- a/config.tar.bz2
+++ b/config.tar.bz2
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0ce8488478e00044265dbd3ccf50b9b0446cc5eb83588b9ad50055ea99572e5e
-size 409498
+oid sha256:f6b0858490e21459cef097ec022dd6289a90f9abb8d48ae565994721729cbf0e
+size 371781
diff --git a/kernel-debug.changes b/kernel-debug.changes
index e28c32dd..e4fbbf24 100644
--- a/kernel-debug.changes
+++ b/kernel-debug.changes
@@ -23,6 +23,12 @@ Tue Sep 29 20:29:23 CEST 2015 - jslaby@suse.cz
- Update config files.
- commit 5256b5c
+-------------------------------------------------------------------
+Fri Sep 25 22:42:00 CEST 2015 - mmarek@suse.cz
+
+- Merge kernel-desktop back into kernel-default/kernel-pae (fate#319416)
+- commit ad49492
+
-------------------------------------------------------------------
Fri Sep 25 10:21:54 CEST 2015 - tiwai@suse.de
diff --git a/kernel-debug.spec b/kernel-debug.spec
index 9a421744..3ae9a6f9 100644
--- a/kernel-debug.spec
+++ b/kernel-debug.spec
@@ -61,7 +61,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.2.2
%if 0%{?is_kotd}
-Release: .gb3ecf72
+Release: .gad49492
%else
Release: 0
%endif
diff --git a/kernel-default.changes b/kernel-default.changes
index e28c32dd..e4fbbf24 100644
--- a/kernel-default.changes
+++ b/kernel-default.changes
@@ -23,6 +23,12 @@ Tue Sep 29 20:29:23 CEST 2015 - jslaby@suse.cz
- Update config files.
- commit 5256b5c
+-------------------------------------------------------------------
+Fri Sep 25 22:42:00 CEST 2015 - mmarek@suse.cz
+
+- Merge kernel-desktop back into kernel-default/kernel-pae (fate#319416)
+- commit ad49492
+
-------------------------------------------------------------------
Fri Sep 25 10:21:54 CEST 2015 - tiwai@suse.de
diff --git a/kernel-default.spec b/kernel-default.spec
index 57f915c0..aecec66e 100644
--- a/kernel-default.spec
+++ b/kernel-default.spec
@@ -61,7 +61,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.2.2
%if 0%{?is_kotd}
-Release: .gb3ecf72
+Release: .gad49492
%else
Release: 0
%endif
@@ -167,6 +167,8 @@ Provides: kernel-trace = 3.13
Obsoletes: kernel-trace <= 3.13
Provides: kernel-bigsmp = 3.1
Obsoletes: kernel-bigsmp <= 3.1
+Provides: kernel-desktop = 3.17
+Obsoletes: kernel-desktop <= 3.17
%endif
%ifarch %ix86
Provides: kernel-trace-base = 3.13
@@ -185,6 +187,8 @@ Provides: kernel-trace-base = 3.13
Obsoletes: kernel-trace-base <= 3.13
Provides: kernel-bigsmp-base = 3.1
Obsoletes: kernel-bigsmp-base <= 3.1
+Provides: kernel-desktop-base = 3.17
+Obsoletes: kernel-desktop-base <= 3.17
%endif
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz
@@ -1009,6 +1013,8 @@ Provides: kernel-trace-base = 3.13
Obsoletes: kernel-trace-base <= 3.13
Provides: kernel-bigsmp-base = 3.1
Obsoletes: kernel-bigsmp-base <= 3.1
+Provides: kernel-desktop-base = 3.17
+Obsoletes: kernel-desktop-base <= 3.17
%endif
%obsolete_rebuilds %name-base
%ifarch %ix86
@@ -1065,6 +1071,8 @@ Provides: kernel-trace-extra = 3.13
Obsoletes: kernel-trace-extra <= 3.13
Provides: kernel-bigsmp-extra = 3.1
Obsoletes: kernel-bigsmp-extra <= 3.1
+Provides: kernel-desktop-extra = 3.17
+Obsoletes: kernel-desktop-extra <= 3.17
%endif
%obsolete_rebuilds %name-extra
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
@@ -1134,6 +1142,8 @@ Provides: kernel-trace-devel = 3.13
Obsoletes: kernel-trace-devel <= 3.13
Provides: kernel-bigsmp-devel = 3.1
Obsoletes: kernel-bigsmp-devel <= 3.1
+Provides: kernel-desktop-devel = 3.17
+Obsoletes: kernel-desktop-devel <= 3.17
%endif
%obsolete_rebuilds %name-devel
PreReq: coreutils
diff --git a/kernel-docs.changes b/kernel-docs.changes
index e28c32dd..e4fbbf24 100644
--- a/kernel-docs.changes
+++ b/kernel-docs.changes
@@ -23,6 +23,12 @@ Tue Sep 29 20:29:23 CEST 2015 - jslaby@suse.cz
- Update config files.
- commit 5256b5c
+-------------------------------------------------------------------
+Fri Sep 25 22:42:00 CEST 2015 - mmarek@suse.cz
+
+- Merge kernel-desktop back into kernel-default/kernel-pae (fate#319416)
+- commit ad49492
+
-------------------------------------------------------------------
Fri Sep 25 10:21:54 CEST 2015 - tiwai@suse.de
diff --git a/kernel-docs.spec b/kernel-docs.spec
index 3f430125..a8c181e2 100644
--- a/kernel-docs.spec
+++ b/kernel-docs.spec
@@ -29,7 +29,7 @@ License: GPL-2.0
Group: Documentation/Man
Version: 4.2.2
%if 0%{?is_kotd}
-Release: .gb3ecf72
+Release: .gad49492
%else
Release: 0
%endif
diff --git a/kernel-ec2.changes b/kernel-ec2.changes
index e28c32dd..e4fbbf24 100644
--- a/kernel-ec2.changes
+++ b/kernel-ec2.changes
@@ -23,6 +23,12 @@ Tue Sep 29 20:29:23 CEST 2015 - jslaby@suse.cz
- Update config files.
- commit 5256b5c
+-------------------------------------------------------------------
+Fri Sep 25 22:42:00 CEST 2015 - mmarek@suse.cz
+
+- Merge kernel-desktop back into kernel-default/kernel-pae (fate#319416)
+- commit ad49492
+
-------------------------------------------------------------------
Fri Sep 25 10:21:54 CEST 2015 - tiwai@suse.de
diff --git a/kernel-ec2.spec b/kernel-ec2.spec
index 40c65788..11472ec4 100644
--- a/kernel-ec2.spec
+++ b/kernel-ec2.spec
@@ -61,7 +61,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.2.2
%if 0%{?is_kotd}
-Release: .gb3ecf72
+Release: .gad49492
%else
Release: 0
%endif
diff --git a/kernel-lpae.changes b/kernel-lpae.changes
index e28c32dd..e4fbbf24 100644
--- a/kernel-lpae.changes
+++ b/kernel-lpae.changes
@@ -23,6 +23,12 @@ Tue Sep 29 20:29:23 CEST 2015 - jslaby@suse.cz
- Update config files.
- commit 5256b5c
+-------------------------------------------------------------------
+Fri Sep 25 22:42:00 CEST 2015 - mmarek@suse.cz
+
+- Merge kernel-desktop back into kernel-default/kernel-pae (fate#319416)
+- commit ad49492
+
-------------------------------------------------------------------
Fri Sep 25 10:21:54 CEST 2015 - tiwai@suse.de
diff --git a/kernel-lpae.spec b/kernel-lpae.spec
index 9780c196..8b8e42eb 100644
--- a/kernel-lpae.spec
+++ b/kernel-lpae.spec
@@ -61,7 +61,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.2.2
%if 0%{?is_kotd}
-Release: .gb3ecf72
+Release: .gad49492
%else
Release: 0
%endif
diff --git a/kernel-module-subpackage b/kernel-module-subpackage
index 804a64d1..3b220235 100644
--- a/kernel-module-subpackage
+++ b/kernel-module-subpackage
@@ -31,6 +31,12 @@ Obsoletes: %{-n*}-trace
%ifarch %ix86
Obsoletes: %{-n*}-vmi
%endif
+%ifarch x86_64
+Obsoletes: %{-n*}-desktop
+%endif
+%endif
+%if %1 == "pae"
+Obsoletes: %{-n*}-desktop
%endif
AutoReqProv: on
%{-p:%{expand:%(cd %_sourcedir; cat %{-p*})}}
diff --git a/kernel-obs-build.changes b/kernel-obs-build.changes
index e28c32dd..e4fbbf24 100644
--- a/kernel-obs-build.changes
+++ b/kernel-obs-build.changes
@@ -23,6 +23,12 @@ Tue Sep 29 20:29:23 CEST 2015 - jslaby@suse.cz
- Update config files.
- commit 5256b5c
+-------------------------------------------------------------------
+Fri Sep 25 22:42:00 CEST 2015 - mmarek@suse.cz
+
+- Merge kernel-desktop back into kernel-default/kernel-pae (fate#319416)
+- commit ad49492
+
-------------------------------------------------------------------
Fri Sep 25 10:21:54 CEST 2015 - tiwai@suse.de
diff --git a/kernel-obs-build.spec b/kernel-obs-build.spec
index af4c6b18..5176ce6a 100644
--- a/kernel-obs-build.spec
+++ b/kernel-obs-build.spec
@@ -47,7 +47,7 @@ License: GPL-2.0
Group: SLES
Version: 4.2.2
%if 0%{?is_kotd}
-Release: .gb3ecf72
+Release: .gad49492
%else
Release: 0
%endif
diff --git a/kernel-obs-qa-xen.changes b/kernel-obs-qa-xen.changes
index e28c32dd..e4fbbf24 100644
--- a/kernel-obs-qa-xen.changes
+++ b/kernel-obs-qa-xen.changes
@@ -23,6 +23,12 @@ Tue Sep 29 20:29:23 CEST 2015 - jslaby@suse.cz
- Update config files.
- commit 5256b5c
+-------------------------------------------------------------------
+Fri Sep 25 22:42:00 CEST 2015 - mmarek@suse.cz
+
+- Merge kernel-desktop back into kernel-default/kernel-pae (fate#319416)
+- commit ad49492
+
-------------------------------------------------------------------
Fri Sep 25 10:21:54 CEST 2015 - tiwai@suse.de
diff --git a/kernel-obs-qa-xen.spec b/kernel-obs-qa-xen.spec
index cbd604a6..d122d657 100644
--- a/kernel-obs-qa-xen.spec
+++ b/kernel-obs-qa-xen.spec
@@ -38,7 +38,7 @@ License: GPL-2.0
Group: SLES
Version: 4.2.2
%if 0%{?is_kotd}
-Release: .gb3ecf72
+Release: .gad49492
%else
Release: 0
%endif
diff --git a/kernel-obs-qa.changes b/kernel-obs-qa.changes
index e28c32dd..e4fbbf24 100644
--- a/kernel-obs-qa.changes
+++ b/kernel-obs-qa.changes
@@ -23,6 +23,12 @@ Tue Sep 29 20:29:23 CEST 2015 - jslaby@suse.cz
- Update config files.
- commit 5256b5c
+-------------------------------------------------------------------
+Fri Sep 25 22:42:00 CEST 2015 - mmarek@suse.cz
+
+- Merge kernel-desktop back into kernel-default/kernel-pae (fate#319416)
+- commit ad49492
+
-------------------------------------------------------------------
Fri Sep 25 10:21:54 CEST 2015 - tiwai@suse.de
diff --git a/kernel-obs-qa.spec b/kernel-obs-qa.spec
index fb1493bf..1506d874 100644
--- a/kernel-obs-qa.spec
+++ b/kernel-obs-qa.spec
@@ -38,7 +38,7 @@ License: GPL-2.0
Group: SLES
Version: 4.2.2
%if 0%{?is_kotd}
-Release: .gb3ecf72
+Release: .gad49492
%else
Release: 0
%endif
diff --git a/kernel-pae.changes b/kernel-pae.changes
index e28c32dd..e4fbbf24 100644
--- a/kernel-pae.changes
+++ b/kernel-pae.changes
@@ -23,6 +23,12 @@ Tue Sep 29 20:29:23 CEST 2015 - jslaby@suse.cz
- Update config files.
- commit 5256b5c
+-------------------------------------------------------------------
+Fri Sep 25 22:42:00 CEST 2015 - mmarek@suse.cz
+
+- Merge kernel-desktop back into kernel-default/kernel-pae (fate#319416)
+- commit ad49492
+
-------------------------------------------------------------------
Fri Sep 25 10:21:54 CEST 2015 - tiwai@suse.de
diff --git a/kernel-pae.spec b/kernel-pae.spec
index 33c619cd..a319c854 100644
--- a/kernel-pae.spec
+++ b/kernel-pae.spec
@@ -61,7 +61,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.2.2
%if 0%{?is_kotd}
-Release: .gb3ecf72
+Release: .gad49492
%else
Release: 0
%endif
@@ -151,10 +151,14 @@ Provides: kernel-bigsmp = 2.6.17
Obsoletes: kernel-bigsmp <= 2.6.17
Provides: kernel-vmi = 2.6.38
Obsoletes: kernel-vmi <= 2.6.38
+Provides: kernel-desktop = 3.17
+Obsoletes: kernel-desktop <= 3.17
%endif
%ifarch %ix86
Provides: kernel-vmi-base = 2.6.38
Obsoletes: kernel-vmi-base <= 2.6.38
+Provides: kernel-desktop-base = 3.17
+Obsoletes: kernel-desktop-base <= 3.17
%endif
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz
@@ -972,6 +976,8 @@ Requires(post): mkinitrd
%ifarch %ix86
Provides: kernel-vmi-base = 2.6.38
Obsoletes: kernel-vmi-base <= 2.6.38
+Provides: kernel-desktop-base = 3.17
+Obsoletes: kernel-desktop-base <= 3.17
%endif
%obsolete_rebuilds %name-base
%ifarch %ix86
@@ -1021,6 +1027,8 @@ Requires(post): mkinitrd
%ifarch %ix86
Provides: kernel-vmi-extra = 2.6.38
Obsoletes: kernel-vmi-extra <= 2.6.38
+Provides: kernel-desktop-extra = 3.17
+Obsoletes: kernel-desktop-extra <= 3.17
%endif
%obsolete_rebuilds %name-extra
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
@@ -1083,6 +1091,8 @@ Supplements: packageand(%name:kernel-devel%variant)
%ifarch %ix86
Provides: kernel-vmi-devel = 2.6.38
Obsoletes: kernel-vmi-devel <= 2.6.38
+Provides: kernel-desktop-devel = 3.17
+Obsoletes: kernel-desktop-devel <= 3.17
%endif
%obsolete_rebuilds %name-devel
PreReq: coreutils
diff --git a/kernel-pv.changes b/kernel-pv.changes
index e28c32dd..e4fbbf24 100644
--- a/kernel-pv.changes
+++ b/kernel-pv.changes
@@ -23,6 +23,12 @@ Tue Sep 29 20:29:23 CEST 2015 - jslaby@suse.cz
- Update config files.
- commit 5256b5c
+-------------------------------------------------------------------
+Fri Sep 25 22:42:00 CEST 2015 - mmarek@suse.cz
+
+- Merge kernel-desktop back into kernel-default/kernel-pae (fate#319416)
+- commit ad49492
+
-------------------------------------------------------------------
Fri Sep 25 10:21:54 CEST 2015 - tiwai@suse.de
diff --git a/kernel-pv.spec b/kernel-pv.spec
index 477afb56..a698cff9 100644
--- a/kernel-pv.spec
+++ b/kernel-pv.spec
@@ -61,7 +61,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.2.2
%if 0%{?is_kotd}
-Release: .gb3ecf72
+Release: .gad49492
%else
Release: 0
%endif
diff --git a/kernel-source.changes b/kernel-source.changes
index e28c32dd..e4fbbf24 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -23,6 +23,12 @@ Tue Sep 29 20:29:23 CEST 2015 - jslaby@suse.cz
- Update config files.
- commit 5256b5c
+-------------------------------------------------------------------
+Fri Sep 25 22:42:00 CEST 2015 - mmarek@suse.cz
+
+- Merge kernel-desktop back into kernel-default/kernel-pae (fate#319416)
+- commit ad49492
+
-------------------------------------------------------------------
Fri Sep 25 10:21:54 CEST 2015 - tiwai@suse.de
diff --git a/kernel-source.spec b/kernel-source.spec
index 6279d044..6cdbd0a5 100644
--- a/kernel-source.spec
+++ b/kernel-source.spec
@@ -32,7 +32,7 @@ License: GPL-2.0
Group: Development/Sources
Version: 4.2.2
%if 0%{?is_kotd}
-Release: .gb3ecf72
+Release: .gad49492
%else
Release: 0
%endif
diff --git a/kernel-syms.changes b/kernel-syms.changes
index e28c32dd..e4fbbf24 100644
--- a/kernel-syms.changes
+++ b/kernel-syms.changes
@@ -23,6 +23,12 @@ Tue Sep 29 20:29:23 CEST 2015 - jslaby@suse.cz
- Update config files.
- commit 5256b5c
+-------------------------------------------------------------------
+Fri Sep 25 22:42:00 CEST 2015 - mmarek@suse.cz
+
+- Merge kernel-desktop back into kernel-default/kernel-pae (fate#319416)
+- commit ad49492
+
-------------------------------------------------------------------
Fri Sep 25 10:21:54 CEST 2015 - tiwai@suse.de
diff --git a/kernel-syms.spec b/kernel-syms.spec
index 313a38b9..35d169d9 100644
--- a/kernel-syms.spec
+++ b/kernel-syms.spec
@@ -27,7 +27,7 @@ Group: Development/Sources
Version: 4.2.2
%if %using_buildservice
%if 0%{?is_kotd}
-Release: .gb3ecf72
+Release: .gad49492
%else
Release: 0
%endif
@@ -41,9 +41,6 @@ BuildRequires: coreutils
%ifarch aarch64 armv7hl %ix86 ppc ppc64 ppc64le s390x x86_64
Requires: kernel-default-devel = %version-%source_rel
%endif
-%ifarch %ix86 x86_64
-Requires: kernel-desktop-devel = %version-%source_rel
-%endif
%ifarch armv7hl
Requires: kernel-lpae-devel = %version-%source_rel
%endif
diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes
index e28c32dd..e4fbbf24 100644
--- a/kernel-vanilla.changes
+++ b/kernel-vanilla.changes
@@ -23,6 +23,12 @@ Tue Sep 29 20:29:23 CEST 2015 - jslaby@suse.cz
- Update config files.
- commit 5256b5c
+-------------------------------------------------------------------
+Fri Sep 25 22:42:00 CEST 2015 - mmarek@suse.cz
+
+- Merge kernel-desktop back into kernel-default/kernel-pae (fate#319416)
+- commit ad49492
+
-------------------------------------------------------------------
Fri Sep 25 10:21:54 CEST 2015 - tiwai@suse.de
diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index ee21453a..298f8c3f 100644
--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@@ -61,7 +61,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.2.2
%if 0%{?is_kotd}
-Release: .gb3ecf72
+Release: .gad49492
%else
Release: 0
%endif
diff --git a/kernel-xen.changes b/kernel-xen.changes
index e28c32dd..e4fbbf24 100644
--- a/kernel-xen.changes
+++ b/kernel-xen.changes
@@ -23,6 +23,12 @@ Tue Sep 29 20:29:23 CEST 2015 - jslaby@suse.cz
- Update config files.
- commit 5256b5c
+-------------------------------------------------------------------
+Fri Sep 25 22:42:00 CEST 2015 - mmarek@suse.cz
+
+- Merge kernel-desktop back into kernel-default/kernel-pae (fate#319416)
+- commit ad49492
+
-------------------------------------------------------------------
Fri Sep 25 10:21:54 CEST 2015 - tiwai@suse.de
diff --git a/kernel-xen.spec b/kernel-xen.spec
index cee45c63..7b1adf43 100644
--- a/kernel-xen.spec
+++ b/kernel-xen.spec
@@ -61,7 +61,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.2.2
%if 0%{?is_kotd}
-Release: .gb3ecf72
+Release: .gad49492
%else
Release: 0
%endif
diff --git a/old-flavors b/old-flavors
index 7bb6db2c..54d7b9c7 100644
--- a/old-flavors
+++ b/old-flavors
@@ -34,3 +34,7 @@ x86_64/default trace 3.13
x86_64/default bigsmp 3.1
s390x/default trace 3.13
+
+# openSUSE 13.2
+i386/pae desktop 3.17
+x86_64/default desktop 3.17
diff --git a/source-timestamp b/source-timestamp
index 40348bfa..268c9b0a 100644
--- a/source-timestamp
+++ b/source-timestamp
@@ -1,3 +1,3 @@
-2015-09-29 20:51:15 +0200
-GIT Revision: b3ecf72fe1924bc4d11c5e6043d9045a7b12c739
+2015-09-30 21:14:34 +0200
+GIT Revision: ad49492ffc23faefc88ca4f3b3d9de64fbdbf1d8
GIT Branch: stable
diff --git a/sysctl.tar.bz2 b/sysctl.tar.bz2
index be0eb36c..fdcda792 100644
--- a/sysctl.tar.bz2
+++ b/sysctl.tar.bz2
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6d9d06bcaa5be2453241e64ca4995caea7dd27b4a7235c9777d3ecaf09a2bb2c
-size 851
+oid sha256:f9b11db009db01d930ee604ba73105eb260790a62fdf3daf5521cb0aeacc22c3
+size 841