From 819bdc93ac85523e5d17d82129098f4f3198c400 Mon Sep 17 00:00:00 2001
From: Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
Date: Wed, 29 Apr 2015 17:28:11 +0300
Subject: [PATCH 01/15] Enabled SPI: needed by the cert. systems

---
 .abf.yml    | 2 +-
 kernel.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index eff34e7..7fb0240 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,4 +1,4 @@
 sources:
   "linux-3.14.tar.xz": fc777520e5976caf0d5513502b8156f73748e379
   "patch-3.14.39.xz": c018d817a13875baaf414ede33c51912a74b1d52
-  "kernel-patches-and-configs-3.14.39.tar.xz": 311b64c864771d6b7bf119a779309bb3870b15f2
+  "kernel-patches-and-configs-3.14.39.tar.xz": ba0c44eeac4125f84300d149bf995142be03bc87
diff --git a/kernel.spec b/kernel.spec
index bd43320..80b0ebe 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -29,7 +29,7 @@
 %define rpmrel		%mkrel 0.%{kpatch}.%{mibrel}
 %endif
 %else
-%define rpmrel		4
+%define rpmrel		5
 %endif
 
 # fakerel and fakever never change, they are used to fool

From e14f05d557b1c679be77d58aa6b7c9270332bf3c Mon Sep 17 00:00:00 2001
From: Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
Date: Mon, 25 May 2015 12:00:38 +0300
Subject: [PATCH 02/15] Added 2 patches from 3.14.40 to fix bug #5622

---
 .abf.yml    | 2 +-
 kernel.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index 7fb0240..a27a8ba 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,4 +1,4 @@
 sources:
   "linux-3.14.tar.xz": fc777520e5976caf0d5513502b8156f73748e379
   "patch-3.14.39.xz": c018d817a13875baaf414ede33c51912a74b1d52
-  "kernel-patches-and-configs-3.14.39.tar.xz": ba0c44eeac4125f84300d149bf995142be03bc87
+  "kernel-patches-and-configs-3.14.39.tar.xz": 17aacc499c1ff42799259140e18847612a837077
diff --git a/kernel.spec b/kernel.spec
index 80b0ebe..2784ad5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -29,7 +29,7 @@
 %define rpmrel		%mkrel 0.%{kpatch}.%{mibrel}
 %endif
 %else
-%define rpmrel		5
+%define rpmrel		6
 %endif
 
 # fakerel and fakever never change, they are used to fool

From 580cc5124d6972f69a9dd138e95faa8f5dc30ca8 Mon Sep 17 00:00:00 2001
From: Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
Date: Wed, 3 Jun 2015 14:22:14 +0300
Subject: [PATCH 03/15] If SELinux is used, set CONFIG_AUDITSYSCALL=y as well

---
 .abf.yml    | 2 +-
 kernel.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index a27a8ba..1eeff40 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,4 +1,4 @@
 sources:
   "linux-3.14.tar.xz": fc777520e5976caf0d5513502b8156f73748e379
   "patch-3.14.39.xz": c018d817a13875baaf414ede33c51912a74b1d52
-  "kernel-patches-and-configs-3.14.39.tar.xz": 17aacc499c1ff42799259140e18847612a837077
+  "kernel-patches-and-configs-3.14.39.tar.xz": 885c9d7251ed2249d7fa8bbbe012cbf7b83e8035
diff --git a/kernel.spec b/kernel.spec
index 2784ad5..8eddb18 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -29,7 +29,7 @@
 %define rpmrel		%mkrel 0.%{kpatch}.%{mibrel}
 %endif
 %else
-%define rpmrel		6
+%define rpmrel		7
 %endif
 
 # fakerel and fakever never change, they are used to fool

From 1e65e6c9eec178ecfe2fb095a92b8b369abe2319 Mon Sep 17 00:00:00 2001
From: Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
Date: Thu, 11 Jun 2015 14:11:30 +0300
Subject: [PATCH 04/15] Removed the obsolete Readme

---
 README.kernel-sources | 91 -------------------------------------------
 1 file changed, 91 deletions(-)
 delete mode 100644 README.kernel-sources

diff --git a/README.kernel-sources b/README.kernel-sources
deleted file mode 100644
index a3132ad..0000000
--- a/README.kernel-sources
+++ /dev/null
@@ -1,91 +0,0 @@
-Hello Mandriva, OpenMandriva, MagOS and Rosa Linux Users,
-
-linux-userspace-headers contains the headers for the source code of
-Linux kernel. All source code necessary to compile a new kernel is
-included in two packages linux-userspace-headers, and kernel-source.
-You will need to install both linux-userspace-headers (needed for
-general Linux compilation), and kernel-source in order to compile
-a new kernel.
-
-The kernel is the central process of your Linux machine, the mediator
-between the hardware and your programs. It is responsible for memory
-allocations, process managing, device access...
-
-Although modern kernels are very flexible thanks to dynamic modules, you
-may need to compile your own kernel for various reasons: your found a
-new module which need a more recent kernel, you need a feature of a new
-kernel, etc...
-
-Here is a short sum-up of what you can find in the Kernel-HOWTO. Consult
-it in case of a problem or if the shortcut here provided does not meet
-your needs. You should also consult the README of kernel-sources.
-
-
-
-1. Configure your new kernel
-
-You should never build a kernel as root, so as a normal user:
-Copy the source in /usr/src/linux/ to ~/kernel/
-Change to ~/kernel/ and clean-up previous compilations, by issuing 
-"make mrproper",
-In console mode, run "make menuconfig",
-Under X11, run "make xconfig".
-
-Then configure all sections of your kernel making each feature you need
-available constantly or as a module. Note that you should compile most
-features as a module, as it consume less memory, taking into account
-that some of them cannot be modules as you may need them at boot time,
-before dynamic modules be loaded...
-
-
-
-2. Compile it
-
-Just issue "make" to create a compressed kernel image and the modules you 
-configured.
-
-
-
-3. install your new kernel
-
-Now you need root privilegies, so:
-Issue "su" and enter root password.
-Issue "make modules_install"
-
-This will copy your modules and needed files to /lib/modules/
-
-Issue "make install"
-
-This will copy your new kernel and system.map to boot dir (/boot/) with
-correct names including version, and change respective links.
-
-It finally runs lilo to take into account your new kernel.
-
-
-
-4. Modify Lilo to allow your booting on old kernel
-
-* This step is optional, although recommended *
-See lilo.conf man page.
-Your are encouraged during this step to create a new section in your
-lilo.conf file, in order to enable you to boot on your both kernels, the
-old and the new one.
-You need to run lilo then to take your changes into account.
-You may also use linuxconf to do all that with a nice GUI.
-
-
-
-5. Reboot your machine...
-
-And pray.
-Anyway if something goes wrong, you just need to reboot and choose your
-old kernel with lilo.
-
-Enjoy!
-
-
-========================================================================
-(c) 1999-2006 Mandriva, Camille Bégnis <camille@mandriva.com>
-(c) 2006 Thomas Backlund <tmb@mandriva.org> 
-(c) 2011 Thomas Backlund <tmb@mageia.org> 
-(c) 2011 Nicolň Costanza <abitrules@yahoo.it> 

From 5d66ca0adb4845810da7a3f228973bc50f7db103 Mon Sep 17 00:00:00 2001
From: Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
Date: Thu, 11 Jun 2015 14:14:24 +0300
Subject: [PATCH 05/15] Removed the obsolete Readme (v2)

---
 kernel.spec | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/kernel.spec b/kernel.spec
index 8eddb18..65eeaff 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -346,7 +346,6 @@ NoSource: 0
 # This is for disabling *config, mrproper, prepare, scripts on -devel rpms
 Source2: 	disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch
 
-Source4: 	README.kernel-sources
 Source5:	kernel.rpmlintrc
 
 # Cpupower: the service, the config, etc.
@@ -1403,7 +1402,6 @@ $DevelRoot/Kconfig
 $DevelRoot/Makefile
 $DevelRoot/Module.symvers
 $DevelRoot/arch/Kconfig
-%doc README.kernel-sources
 %{_modulesdir}/$KernelVer/build
 %{_modulesdir}/$KernelVer/source
 EOF
@@ -1494,7 +1492,6 @@ cat > $kernel_files <<EOF
 %{_bootdir}/$ker-$KernelVer
 %{_modulesdir}/$KernelVer/kernel
 %{_modulesdir}/$KernelVer/modules.*
-%doc README.kernel-sources
 EOF
 
 %if %build_debug
@@ -1930,7 +1927,6 @@ rm -rf %{buildroot}
 %{_kerneldir}/Makefile
 %{_kerneldir}/README
 %{_kerneldir}/REPORTING-BUGS
-%doc README.kernel-sources
 
 %files -n %{kname}-source-latest
 %endif

From 2a573f8cd7ab72970446e592d93d2897c61696b7 Mon Sep 17 00:00:00 2001
From: Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
Date: Thu, 11 Jun 2015 14:17:55 +0300
Subject: [PATCH 06/15] Get the patchset and configs from abf.io/soft/...
 directly

One just needs to add a git tag "version-release" to the code in
https://abf.io/soft/kernel-patches-and-configs/.

No need to upload these archives to FileStore anymore.
---
 .abf.yml    | 1 -
 kernel.spec | 9 +++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index 1eeff40..4e080f8 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,4 +1,3 @@
 sources:
   "linux-3.14.tar.xz": fc777520e5976caf0d5513502b8156f73748e379
   "patch-3.14.39.xz": c018d817a13875baaf414ede33c51912a74b1d52
-  "kernel-patches-and-configs-3.14.39.tar.xz": 885c9d7251ed2249d7fa8bbbe012cbf7b83e8035
diff --git a/kernel.spec b/kernel.spec
index 65eeaff..725a9f7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -356,9 +356,8 @@ Source53:	cpupower.path
 
 # Our patch tarball,
 # see https://abf.rosalinux.ru/soft/kernel-patches-and-configs/
-Source100: 	kernel-patches-and-configs-%{kversion}.tar.xz
-
-####################################################################
+Source100: 	https://abf.io/soft/kernel-patches-and-configs/archive/kernel-patches-and-configs-%{kversion}-%{rpmrel}.tar.gz
+# ####################################################################
 #
 # Patches
 
@@ -1097,7 +1096,7 @@ should use the 'kernel-devel' package instead.
 %setup -q -n %top_dir_name -c
 %setup -q -n %top_dir_name -D -T -a100
 
-%define patches_dir ../kernel-patches-and-configs/
+%define patches_dir ../kernel-patches-and-configs-%{kversion}-%{rpmrel}/
 
 cd %src_dir
 
@@ -1744,8 +1743,6 @@ chmod +x tools/power/cpupower/utils/version-gen.sh
 ### install
 ###
 %install
-install -m 644 %{SOURCE4}  .
-
 cd %src_dir
 
 # Directories definition needed for installing

From 0c3b96451db2a5a9f278a91d5fe2cd4ebfd7dc94 Mon Sep 17 00:00:00 2001
From: Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
Date: Thu, 11 Jun 2015 16:59:24 +0300
Subject: [PATCH 07/15] Updated to version 3.14.44

Besides the updates from the upstream, the following changes were made:
* added fixes for CVE-2014-3647, CVE-2015-4036, CVE-2015-2666;
* updated AUFS patches;
* updated BFQ patches to version v7r8;
* re-enabled SPI.
---
 .abf.yml           |  2 +-
 kernel.spec        |  4 ++--
 patch-3.14.39.sign | 17 -----------------
 patch-3.14.44.sign | 17 +++++++++++++++++
 4 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 patch-3.14.39.sign
 create mode 100644 patch-3.14.44.sign

diff --git a/.abf.yml b/.abf.yml
index 4e080f8..39f33fa 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,3 @@
 sources:
   "linux-3.14.tar.xz": fc777520e5976caf0d5513502b8156f73748e379
-  "patch-3.14.39.xz": c018d817a13875baaf414ede33c51912a74b1d52
+  "patch-3.14.44.xz": f20d6cd99508f303c007f93ad44c930025f49e18
diff --git a/kernel.spec b/kernel.spec
index 725a9f7..4b2246a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -3,7 +3,7 @@
 %define kernelversion	3
 %define patchlevel	14
 # sublevel is now used for -stable patches
-%define sublevel	39
+%define sublevel	44
 
 # Package release
 %define mibrel		69
@@ -29,7 +29,7 @@
 %define rpmrel		%mkrel 0.%{kpatch}.%{mibrel}
 %endif
 %else
-%define rpmrel		7
+%define rpmrel		1
 %endif
 
 # fakerel and fakever never change, they are used to fool
diff --git a/patch-3.14.39.sign b/patch-3.14.39.sign
deleted file mode 100644
index 884063e..0000000
--- a/patch-3.14.39.sign
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAABCAAGBQJVM2NoAAoJEDjbvchgkmk+NXoP/2ypQgBYleCcFhymSzSZpqYh
-QFyZrbSvQ8MMP6jW3hqTd/852Lew+ug1AMImufxwFCHWVOuJ2rfTl/lcLpG1hP9I
-pXnWarfbUcfHq4ozw1RFfDp9E0LySCSeorMbjQptHse76J96tq0NDyPSyk1zESiY
-oZE3cw/9D1Vr6O95o/BoFj5bXYwyetPVGHT65B30dmpatooOzl9kzbFc7vF5yV7H
-r9stlJ2hwqyooXmM1hEj2xuPbxtipDLQU5wZ3Cz+UKXjBBQDboBbCwQxNDiB0VNf
-cTNp/b65ACy7h/8cUlE9r6xDN/dG9trzUXOhkbu0zskOHBHbR9OrGAm8QdQQUS6K
-ZnM1jAsUmPja6/ps4HyfNaGsXqOrVxauiknI5eoNeqKF31uu7oXinF91fiJVZPic
-+gm4U8zhzqLv4VZOUnOOtJKRAI7ozQ7BU38uG97G/q1XsE4Qjm233PR0EKNLmCp2
-vMYC89ATrZkux4ZxXWQtGxJ/G+9QHtUfMqp+27KnPhbnTAjDIAJWwQM7ev8yXL22
-NhsHzc8cndubpYLNOUT5dI+CsVl8GA5LcXeboD6G1ON6UDiH1jb4KuHR3+cQ/ZWG
-tLDPgfzrqc1xQFZ5EfazkLhe46ZIS8uJUWLOdPWqtRDhYEFUgrkB1iaz4jlfKRGS
-P52h7XzrAikQyVToLPgb
-=7otg
------END PGP SIGNATURE-----
diff --git a/patch-3.14.44.sign b/patch-3.14.44.sign
new file mode 100644
index 0000000..9c091c3
--- /dev/null
+++ b/patch-3.14.44.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJVcw+zAAoJEDjbvchgkmk+yA8QAINHxtHlxV8Wv12sz3UxzOOM
+wRNkKVqc67dCdZ+qZ9WhdTSfJbMAPMfJR9WjXgqOkQp5a+4YCjMdq+y6YsFY5UJH
+V7SSrG3VMg2IKOAam+wIMs+k60AsD9Hx4qQw1XEnichpYjNy3LxFGzQvHi+uog18
+mMeudVy9DzCodDnSRwlaL3vs1F+YqFfZGnYLtqf25ZC+pEnhdP87qa9xkSR/dsCT
+AO0BKJG6RzVeTv06H8y6vjL4gJwd/EjNfCmRmAR/ovQFO/cDOx4V0BC6T9Qmi2GS
+K75fU3DyujNug/Ov521r+ADLeIi04arUbOWuWEfsZM7ch914OpkH9IicJH9/L/Da
+3biWg+7e0oK5DObFy0wFUDHlewxjbQCENnoUZaV4Ik5u5k0SPvPhWa512n3ADIK1
+S6fpJWZrMt548PYdO4ywDcbA3tJeg+KJwAaxJSlf9UO9T/+3w+4RjjvOC82/rosy
+y+8jzhyN2KI7+RxaNK4VMjGhOZIQmtZxkESrGpwK5he7H6+Sprsc2OgWXBD2jPbP
+Dvq6KNM03BGD/JwpX3F2f+O8u2SdmII2ND7qtc8YeZuSkpR2RDc9XiJuKPXjIMvN
+GYVp5cAynaBxx2Jf0CcBd/EY4zfhtqrXDc3nkkKG67WbMSfPlNwzDRsVDdU/hqsc
+qxgnCJVUvLWK3etbSl/p
+=2qcc
+-----END PGP SIGNATURE-----

From 6cb70967c78c6bbf2b857567f48028bf7fdea3a5 Mon Sep 17 00:00:00 2001
From: Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
Date: Thu, 11 Jun 2015 17:36:55 +0300
Subject: [PATCH 08/15] Updated patches/0006-sched-move...patch for kernel
 3.14.44 - part 2

---
 kernel.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel.spec b/kernel.spec
index 4b2246a..a5e643e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -29,7 +29,7 @@
 %define rpmrel		%mkrel 0.%{kpatch}.%{mibrel}
 %endif
 %else
-%define rpmrel		1
+%define rpmrel		2
 %endif
 
 # fakerel and fakever never change, they are used to fool

From 36c36f1dc2ef283808544a2f6e1949ac80d51bcc Mon Sep 17 00:00:00 2001
From: Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
Date: Mon, 15 Jun 2015 21:20:11 +0300
Subject: [PATCH 09/15] Added a couple of changes that may help with bug #5649

* Disabled CONFIG_X86_SYSFB.
* Added a patch for cirrus driver to use 16 BPP by default.

See http://bugs.rosalinux.ru/show_bug.cgi?id=5649#c6.
---
 kernel.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel.spec b/kernel.spec
index a5e643e..cb4f60b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -29,7 +29,7 @@
 %define rpmrel		%mkrel 0.%{kpatch}.%{mibrel}
 %endif
 %else
-%define rpmrel		2
+%define rpmrel		3
 %endif
 
 # fakerel and fakever never change, they are used to fool

From c05e51e7f42f11dd3d7af5fde3cac28ad2ef49a3 Mon Sep 17 00:00:00 2001
From: Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
Date: Sun, 5 Jul 2015 21:18:00 +0300
Subject: [PATCH 10/15] Added enhancements to AUFS and Overlay FS

See https://abf.io/soft/kernel-patches-and-configs,
commit 908f69af600a206e2ae3fbc06820f1ad875e1c1b.
---
 kernel.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel.spec b/kernel.spec
index cb4f60b..8d0d022 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -29,7 +29,7 @@
 %define rpmrel		%mkrel 0.%{kpatch}.%{mibrel}
 %endif
 %else
-%define rpmrel		3
+%define rpmrel		4
 %endif
 
 # fakerel and fakever never change, they are used to fool

From 53e25342b60f719f9d42b93e583da74208b64627 Mon Sep 17 00:00:00 2001
From: Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
Date: Wed, 8 Jul 2015 15:21:06 +0300
Subject: [PATCH 11/15] Use the branch name rather than tag for the patchset
 and configs

The tag had to contain both the version and the release of the package.
This is inconvenient when mass rebuilds are in action: the release is
incremented automatically then.

Using the top of the appropriate branch is safer. It is also possible to
specify any other revision, so this scheme is more flexible as well.
---
 kernel.spec | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/kernel.spec b/kernel.spec
index 8d0d022..e92e065 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -41,6 +41,11 @@
 %define kversion  	%{kernelversion}.%{patchlevel}.%{sublevel}
 %define kverrel   	%{kversion}-%{rpmrel}
 
+# The revision of the patchset and the configs to use. Usually, the name of
+# the branch in https://abf.rosalinux.ru/soft/kernel-patches-and-configs/
+# git repository.
+%define revision rosa2014.1
+
 # When we are using a pre/rc patch, the tarball is a sublevel -1
 %if %kpatch
 %if %sublevel
@@ -356,7 +361,7 @@ Source53:	cpupower.path
 
 # Our patch tarball,
 # see https://abf.rosalinux.ru/soft/kernel-patches-and-configs/
-Source100: 	https://abf.io/soft/kernel-patches-and-configs/archive/kernel-patches-and-configs-%{kversion}-%{rpmrel}.tar.gz
+Source100: 	https://abf.io/soft/kernel-patches-and-configs/archive/kernel-patches-and-configs-%{revision}.tar.gz
 # ####################################################################
 #
 # Patches
@@ -1096,7 +1101,7 @@ should use the 'kernel-devel' package instead.
 %setup -q -n %top_dir_name -c
 %setup -q -n %top_dir_name -D -T -a100
 
-%define patches_dir ../kernel-patches-and-configs-%{kversion}-%{rpmrel}/
+%define patches_dir ../kernel-patches-and-configs-%{revision}/
 
 cd %src_dir
 

From 203ada621dcea5c807e5c974d334c887fa4f55d2 Mon Sep 17 00:00:00 2001
From: Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
Date: Thu, 9 Jul 2015 08:34:21 +0300
Subject: [PATCH 12/15] Avoid overlayfs crash in unmount

Pull request:
https://abf.io/soft/kernel-patches-and-configs/pull_requests/2
---
 kernel.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel.spec b/kernel.spec
index e92e065..408cc04 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -29,7 +29,7 @@
 %define rpmrel		%mkrel 0.%{kpatch}.%{mibrel}
 %endif
 %else
-%define rpmrel		4
+%define rpmrel		5
 %endif
 
 # fakerel and fakever never change, they are used to fool

From 16943d043ba61abac9936f8f1f032f828bf357d5 Mon Sep 17 00:00:00 2001
From: Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
Date: Fri, 10 Jul 2015 14:46:35 +0300
Subject: [PATCH 13/15] More fixes for VFS (bug #5926)

Details:
https://abf.io/soft/kernel-patches-and-configs/pull_requests/4
---
 kernel.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel.spec b/kernel.spec
index 408cc04..38aa178 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -29,7 +29,7 @@
 %define rpmrel		%mkrel 0.%{kpatch}.%{mibrel}
 %endif
 %else
-%define rpmrel		5
+%define rpmrel		6
 %endif
 
 # fakerel and fakever never change, they are used to fool

From c6abf64a65027584a72768da050b7d6e9e00c0b9 Mon Sep 17 00:00:00 2001
From: Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
Date: Thu, 24 Sep 2015 08:02:50 +0300
Subject: [PATCH 14/15] Updated to version 3.14.53

---
 .abf.yml           |  2 +-
 kernel.spec        |  4 ++--
 patch-3.14.44.sign | 17 -----------------
 patch-3.14.53.sign | 17 +++++++++++++++++
 4 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 patch-3.14.44.sign
 create mode 100644 patch-3.14.53.sign

diff --git a/.abf.yml b/.abf.yml
index 39f33fa..3d8f9cf 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,3 @@
 sources:
   "linux-3.14.tar.xz": fc777520e5976caf0d5513502b8156f73748e379
-  "patch-3.14.44.xz": f20d6cd99508f303c007f93ad44c930025f49e18
+  "patch-3.14.53.xz": 97cccc341317d7407064e1e3a9a8f25a47f10ba7
diff --git a/kernel.spec b/kernel.spec
index 38aa178..0f136a3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -3,7 +3,7 @@
 %define kernelversion	3
 %define patchlevel	14
 # sublevel is now used for -stable patches
-%define sublevel	44
+%define sublevel	53
 
 # Package release
 %define mibrel		69
@@ -29,7 +29,7 @@
 %define rpmrel		%mkrel 0.%{kpatch}.%{mibrel}
 %endif
 %else
-%define rpmrel		6
+%define rpmrel		1
 %endif
 
 # fakerel and fakever never change, they are used to fool
diff --git a/patch-3.14.44.sign b/patch-3.14.44.sign
deleted file mode 100644
index 9c091c3..0000000
--- a/patch-3.14.44.sign
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAABCAAGBQJVcw+zAAoJEDjbvchgkmk+yA8QAINHxtHlxV8Wv12sz3UxzOOM
-wRNkKVqc67dCdZ+qZ9WhdTSfJbMAPMfJR9WjXgqOkQp5a+4YCjMdq+y6YsFY5UJH
-V7SSrG3VMg2IKOAam+wIMs+k60AsD9Hx4qQw1XEnichpYjNy3LxFGzQvHi+uog18
-mMeudVy9DzCodDnSRwlaL3vs1F+YqFfZGnYLtqf25ZC+pEnhdP87qa9xkSR/dsCT
-AO0BKJG6RzVeTv06H8y6vjL4gJwd/EjNfCmRmAR/ovQFO/cDOx4V0BC6T9Qmi2GS
-K75fU3DyujNug/Ov521r+ADLeIi04arUbOWuWEfsZM7ch914OpkH9IicJH9/L/Da
-3biWg+7e0oK5DObFy0wFUDHlewxjbQCENnoUZaV4Ik5u5k0SPvPhWa512n3ADIK1
-S6fpJWZrMt548PYdO4ywDcbA3tJeg+KJwAaxJSlf9UO9T/+3w+4RjjvOC82/rosy
-y+8jzhyN2KI7+RxaNK4VMjGhOZIQmtZxkESrGpwK5he7H6+Sprsc2OgWXBD2jPbP
-Dvq6KNM03BGD/JwpX3F2f+O8u2SdmII2ND7qtc8YeZuSkpR2RDc9XiJuKPXjIMvN
-GYVp5cAynaBxx2Jf0CcBd/EY4zfhtqrXDc3nkkKG67WbMSfPlNwzDRsVDdU/hqsc
-qxgnCJVUvLWK3etbSl/p
-=2qcc
------END PGP SIGNATURE-----
diff --git a/patch-3.14.53.sign b/patch-3.14.53.sign
new file mode 100644
index 0000000..92d72b6
--- /dev/null
+++ b/patch-3.14.53.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJWADm3AAoJEDjbvchgkmk+DsUQAKQJzMyIXP3IcCG2yug7+PS7
+Wm0JLRv+b+IVI/qxc8WtOz3nj2khnMM0JwjWSqCBPZYty11LLKVDqZ2YjkyMyCl/
+4ql0qiDrrO9RHX020GwrSSxBEisvdq1P5LQ8gBGUEHWNWWnGP+vjjP7ygdkve36k
+Whn5FHXxJdgNOd5z9tco1sE8/+c80EO9TZYYSZAPX8BaxTEtmdW7L0iOSupV2rxv
+mVHWJf46ir/6Nk07QSNGWRc4rFmLU3+bsbnp05nLu08zZOh8hBoCV/GCEhkwZu1k
+4RWbDXgpHrV8tQlxnT42do+rIR6S83u88gz3+anyEx5Ny5DiTk5VfTRP4DoQBdJa
+TDLd2WeQaCt/DybL1TtqqmiFJBdxyofeWE4pYcQjysqgsJl6587ilmaN0y3W1LY1
+Th/b3kXXxPHe5i+WNj6mV+kf7StQBFkptoXC0iYRWuLGo4N5RBWvVW3u5IRKYhVd
+sDbiDauwmp5NAY5mBtClyw0eG/1SfxYDc1Taf4Z3T+zxV8Chp/5Ganx4GxR3FroK
+tp4bO5O3IW7CjiqeUxdJZPEz/avigOp666ma/+YMilv3lAgk77XIZ0T9Iq0nIqDc
+EWGpgR+cM0B16Uqta+TlEYoEIbG68wnuNTO7rkZwcD/BZ+YMTB2K22IMS2xqrnYY
+YCjjKNQ2r9URHz0JVeg+
+=kyBQ
+-----END PGP SIGNATURE-----

From d651dcf6713ae7791f5677e49561eed7be3625d4 Mon Sep 17 00:00:00 2001
From: Evgenii Shatokhin <eugene.shatokhin@rosalab.ru>
Date: Fri, 20 Nov 2015 21:46:00 +0300
Subject: [PATCH 15/15] Kernel 4.1 becomes the official one

The users who wish to use 3.14.x, may get it from the unofficial
repositories:
http://abf-downloads.rosalinux.ru/kernels_stable_personal/repository/rosa2014.1/x86_64/kernel_3_14/release/
http://abf-downloads.rosalinux.ru/kernels_stable_personal/repository/rosa2014.1/i586/kernel_3_14/release/
---
 .abf.yml                                      |  4 +-
 ...repare-scripts-configs-in-devel-rpms.patch | 94 ++++++++-----------
 kernel.spec                                   | 80 ++++++++++++----
 linux-3.14.tar.sign                           | 11 ---
 linux-4.1.tar.sign                            | 11 +++
 patch-3.14.53.sign                            | 17 ----
 patch-4.1.13.sign                             | 17 ++++
 7 files changed, 132 insertions(+), 102 deletions(-)
 delete mode 100644 linux-3.14.tar.sign
 create mode 100644 linux-4.1.tar.sign
 delete mode 100644 patch-3.14.53.sign
 create mode 100644 patch-4.1.13.sign

diff --git a/.abf.yml b/.abf.yml
index 3d8f9cf..e894a43 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,3 @@
 sources:
-  "linux-3.14.tar.xz": fc777520e5976caf0d5513502b8156f73748e379
-  "patch-3.14.53.xz": 97cccc341317d7407064e1e3a9a8f25a47f10ba7
+  "linux-4.1.tar.xz": 2470435c2218f0bcbd46ef2a0000694aca340273
+  "patch-4.1.13.xz": 78fd172e91047d43768cb90c1986fff591595af2
diff --git a/disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch b/disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch
index c6bfe6f..208ad00 100644
--- a/disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch
+++ b/disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch
@@ -1,12 +1,12 @@
 
- Makefile                 |   24 ++++++++++++------------
- scripts/kconfig/Makefile |   19 -------------------
- 2 files changed, 12 insertions(+), 31 deletions(-)
+ Makefile                 |   17 +++++------------
+ scripts/kconfig/Makefile |   16 ----------------
+ 2 files changed, 5 insertions(+), 28 deletions(-)
 
-diff -Nurp linux-3.14.2-1.mga4/Makefile linux-3.14.2-1.mga4.mrproper/Makefile
---- linux-3.14.2-1.mga4/Makefile	2014-04-26 18:57:12.134824274 +0300
-+++ linux-3.14.2-1.mga4.mrproper/Makefile	2014-04-26 18:58:36.410828557 +0300
-@@ -522,9 +522,7 @@ ifeq ($(KBUILD_EXTMOD),)
+diff -Nurp linux-4.1/Makefile linux-4.1-mrproper/Makefile
+--- linux-4.1/Makefile	2015-06-25 21:00:39.742637102 +0200
++++ linux-4.1-mrproper/Makefile	2015-06-25 21:12:36.256154446 +0200
+@@ -550,9 +550,7 @@ ifeq ($(KBUILD_EXTMOD),)
  # Carefully list dependencies so we do not try to build scripts twice
  # in parallel
  PHONY += scripts
@@ -17,7 +17,7 @@ diff -Nurp linux-3.14.2-1.mga4/Makefile linux-3.14.2-1.mga4.mrproper/Makefile
  
  # Objects we will link into vmlinux / subdirs we need to visit
  init-y		:= init/
-@@ -884,7 +882,7 @@ prepare0: archprepare FORCE
+@@ -989,7 +987,7 @@ prepare0: archprepare FORCE
  	$(Q)$(MAKE) $(build)=.
  
  # All the preparing..
@@ -26,30 +26,23 @@ diff -Nurp linux-3.14.2-1.mga4/Makefile linux-3.14.2-1.mga4.mrproper/Makefile
  
  # Generate some files
  # ---------------------------------------------------------------------------
-@@ -1066,13 +1064,15 @@ endif # CONFIG_MODULES
+@@ -1171,13 +1169,8 @@ endif # CONFIG_MODULES
  CLEAN_DIRS  += $(MODVERDIR)
  
  # Directories & files removed with 'make mrproper'
 -MRPROPER_DIRS  += include/config usr/include include/generated          \
--                  arch/*/include/generated
--MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
+-		  arch/*/include/generated .tmp_objdiff
+-MRPROPER_FILES += .config .config.old .version .old_version \
 -		  Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
 -		  signing_key.priv signing_key.x509 x509.genkey		\
 -		  extra_certificates signing_key.x509.keyid		\
--		  signing_key.x509.signer
-+#MRPROPER_DIRS  += include/config usr/include include/generated          \
-+#                  arch/*/include/generated
-+#MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
-+#		  Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
-+#		  signing_key.priv signing_key.x509 x509.genkey		\
-+#		  extra_certificates signing_key.x509.keyid		\
-+#		  signing_key.x509.signer
+-		  signing_key.x509.signer vmlinux-gdb.py
 +MRPROPER_DIRS  += ""
 +MRPROPER_FILES += ""
  
  # clean - Delete most, but leave enough to build external modules
  #
-@@ -1093,7 +1093,7 @@ clean: archclean vmlinuxclean
+@@ -1198,7 +1191,7 @@ clean: archclean vmlinuxclean
  #
  mrproper: rm-dirs  := $(wildcard $(MRPROPER_DIRS))
  mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
@@ -58,66 +51,57 @@ diff -Nurp linux-3.14.2-1.mga4/Makefile linux-3.14.2-1.mga4.mrproper/Makefile
  
  PHONY += $(mrproper-dirs) mrproper archmrproper
  $(mrproper-dirs):
-diff -Nurp linux-3.14.2-1.mga4/scripts/kconfig/Makefile linux-3.14.2-1.mga4.mrproper/scripts/kconfig/Makefile
---- linux-3.14.2-1.mga4/scripts/kconfig/Makefile	2014-04-26 18:57:12.134824274 +0300
-+++ linux-3.14.2-1.mga4.mrproper/scripts/kconfig/Makefile	2014-04-26 18:58:36.411828571 +0300
-@@ -15,26 +15,18 @@ endif
+diff -Nurp linux-4.1/scripts/kconfig/Makefile linux-4.1-mrproper/scripts/kconfig/Makefile
+--- linux-4.1/scripts/kconfig/Makefile	2015-06-25 21:00:39.742637102 +0200
++++ linux-4.1-mrproper/scripts/kconfig/Makefile	2015-06-25 21:20:05.362087673 +0200
+@@ -19,23 +19,16 @@ endif
  unexport CONFIG_
  
  xconfig: $(obj)/qconf 3rdparty/Makefile
--	$< $(Kconfig)
+-	$< $(silent) $(Kconfig)
  
  gconfig: $(obj)/gconf 3rdparty/Makefile
--	$< $(Kconfig)
+-	$< $(silent) $(Kconfig)
  
  menuconfig: $(obj)/mconf 3rdparty/Makefile
--	$< $(Kconfig)
+-	$< $(silent) $(Kconfig)
  
  config: $(obj)/conf 3rdparty/Makefile
--	$< --oldaskconfig $(Kconfig)
+-	$< $(silent) --oldaskconfig $(Kconfig)
  
  nconfig: $(obj)/nconf 3rdparty/Makefile
--	$< $(Kconfig)
- 
- oldconfig: $(obj)/conf 3rdparty/Makefile
--	$< --$@ $(Kconfig)
+-	$< $(silent) $(Kconfig)
  
  silentoldconfig: $(obj)/conf 3rdparty/Makefile
--	$(Q)mkdir -p include/generated
--	$< --$@ $(Kconfig)
+-	$(Q)mkdir -p include/config include/generated
+-	$< $(silent) --$@ $(Kconfig)
  
  localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 3rdparty/Makefile
- 	$(Q)mkdir -p include/generated
-@@ -77,32 +69,21 @@ update-po-config: $(obj)/kxgettext $(obj
- PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
+ 	$(Q)mkdir -p include/config include/generated
+@@ -81,7 +74,6 @@ simple-targets := oldconfig allnoconfig
+ PHONY += $(simple-targets)
  
- allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf 3rdparty/Makefile
--	$< --$@ $(Kconfig)
+ $(simple-targets): $(obj)/conf 3rdparty/Makefile
+-	$< $(silent) --$@ $(Kconfig)
  
- PHONY += listnewconfig olddefconfig oldnoconfig savedefconfig defconfig
+ PHONY += oldnoconfig savedefconfig defconfig
  
- listnewconfig olddefconfig: $(obj)/conf 3rdparty/Makefile
--	$< --$@ $(Kconfig)
- 
- # oldnoconfig is an alias of olddefconfig, because people already are dependent
- # on its behavior(sets new symbols to their default value but not 'n') with the
- # counter-intuitive name.
- oldnoconfig: $(obj)/conf 3rdparty/Makefile
--	$< --olddefconfig $(Kconfig)
+@@ -91,18 +83,10 @@ PHONY += oldnoconfig savedefconfig defco
+ oldnoconfig: olddefconfig 3rdparty/Makefile
  
  savedefconfig: $(obj)/conf 3rdparty/Makefile
--	$< --$@=defconfig $(Kconfig)
+-	$< $(silent) --$@=defconfig $(Kconfig)
  
  defconfig: $(obj)/conf 3rdparty/Makefile
 -ifeq ($(KBUILD_DEFCONFIG),)
--	$< --defconfig $(Kconfig)
+-	$< $(silent) --defconfig $(Kconfig)
 -else
--	@echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
--	$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
+-	@$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
+-	$(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
 -endif
  
  %_defconfig: $(obj)/conf 3rdparty/Makefile
--	$(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
+-	$(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
+ 
+ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@)
  
- # Help text used by make help
- help:
diff --git a/kernel.spec b/kernel.spec
index 0f136a3..4a601ce 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1,12 +1,12 @@
 %{?build_selinux}%{?!build_selinux:%bcond_with selinux}
 
-%define kernelversion	3
-%define patchlevel	14
+%define kernelversion	4
+%define patchlevel	1
 # sublevel is now used for -stable patches
-%define sublevel	53
+%define sublevel	13
 
 # Package release
-%define mibrel		69
+%define mibrel		1
 
 # kernel Makefile extraversion is substituted by
 # kpatch wich are either 0 (empty), rc (kpatch)
@@ -33,7 +33,8 @@
 %endif
 
 # fakerel and fakever never change, they are used to fool
-# rpm/urpmi/smart
+# rpm/urpmi/smart and ensure the kernels are installed,
+# not upgraded so old kernel is not overwritten or removed
 %define fakever		1
 %define fakerel 	%mkrel 1
 
@@ -416,8 +417,8 @@ processor mode, use the "nosmp" boot parameter.
 ### Global Requires/Provides
 
 %define requires1	grub2
-%define requires2	dracut >= 017-16
-%define requires3	kmod >= 7-6
+%define requires2	dracut >= 041-11
+%define requires3	kmod >= 20-1
 %define requires4	sysfsutils >=  2.1.0-12
 %define requires5	kernel-firmware >=  20120219-1
 
@@ -430,10 +431,10 @@ processor mode, use the "nosmp" boot parameter.
 %define	kobsoletes2	dkms-lzma <= 4.43-32
 %define	kobsoletes3	dkms-psb <= 4.41.1-7
 
-# conflict dkms packages that dont support kernel-3.14
-# all driver versions must be carefully checked to add
+# Add conflicts with the dkms packages that do not support this kernel.
+# All driver versions must be carefully checked before adding them here.
 
-%define kconflicts1	dkms-broadcom-wl < 6.30.223.141-6
+%define kconflicts1	dkms-broadcom-wl < 6.30.223.248-3
 %define kconflicts2	dkms-fglrx < 14.10.1006.1001-1
 %define kconflicts3	dkms-nvidia-current < 331.38-5
 %define kconflicts4	dkms-nvidia-long-lived < 304.108-8
@@ -589,6 +590,19 @@ Conflicts:	arch(x86_64)				\
 This package is a virtual rpm that aims to make sure you always have the \
 latest %{kname}-%{1} installed...			\
 							\
+%package -n %{kname}-%{1}-%{kernelversion}.%{patchlevel}-latest \
+Version:	%{kversion}				\
+Release:	%{rpmrel}				\
+Summary:	Meta package for the latest %{kname}-%{1} in %{kernelversion}.%{patchlevel} series \
+Group:		System/Kernel and hardware		\
+Requires:	%{kname}-%{1}-%{buildrel}		\
+%ifarch %{ix86}						\
+Conflicts:	arch(x86_64)				\
+%endif							\
+%description -n %{kname}-%{1}-%{kernelversion}.%{patchlevel}-latest \
+This meta package aims to make sure you always have the \
+latest %{kname}-%{1} %{kernelversion}.%{patchlevel}.x installed... \
+							\
 %if %build_devel					\
 %package -n %{kname}-%{1}-devel-latest			\
 Version:	%{kversion}				\
@@ -606,6 +620,20 @@ Provides:	%{kname}-devel-latest			\
 This package is a virtual rpm that aims to make sure you always have the \
 latest %{kname}-%{1}-devel installed...			\
 							\
+%package -n %{kname}-%{1}-%{kernelversion}.%{patchlevel}-devel-latest \
+Version:	%{kversion}				\
+Release:	%{rpmrel}				\
+Summary:	Meta package for the latest %{kname}-%{1}-devel in %{kernelversion}.%{patchlevel} series \
+Group:		Development/Kernel			\
+Requires:	%{kname}-%{1}-devel-%{buildrel}		\
+%ifarch %{ix86}						\
+Conflicts:	arch(x86_64)				\
+%endif							\
+Provides:	%{kname}-devel-latest			\
+%description -n %{kname}-%{1}-%{kernelversion}.%{patchlevel}-devel-latest \
+This meta package aims to make sure you always have the \
+latest %{kname}-%{1}-devel %{kernelversion}.%{patchlevel}.x installed... \
+							\
 %endif							\
 							\
 %post -n %{kname}-%{1}-%{buildrel} -f kernel_files.%{1}-post \
@@ -620,10 +648,12 @@ latest %{kname}-%{1}-devel installed...			\
 							\
 %files -n %{kname}-%{1}-%{buildrel} -f kernel_files.%{1} \
 %files -n %{kname}-%{1}-latest				\
+%files -n %{kname}-%{1}-%{kernelversion}.%{patchlevel}-latest	\
 							\
 %if %build_devel					\
 %files -n %{kname}-%{1}-devel-%{buildrel} -f kernel_devel_files.%{1} \
 %files -n %{kname}-%{1}-devel-latest			\
+%files -n %{kname}-%{1}-%{kernelversion}.%{patchlevel}-devel-latest \
 %endif							\
 							\
 %if %build_debug					\
@@ -1125,8 +1155,6 @@ cd %src_dir
 
 %{patches_dir}/scripts/apply_patches
 %{patches_dir}/scripts/apply_patches-NRJ
-%{patches_dir}/scripts/apply_patches-geek
-%{patches_dir}/scripts/apply_patches-latest
 
 #
 # Setup Begin
@@ -1260,6 +1288,7 @@ SaveDevel() {
 	mkdir -p $TempDevelRoot
 	for i in $(find . -name 'Makefile*'); do cp -R --parents $i $TempDevelRoot;done
 	for i in $(find . -name 'Kconfig*' -o -name 'Kbuild*'); do cp -R --parents $i $TempDevelRoot;done
+	cp -fR Documentation/DocBook/media/*.b64 $TempDevelRoot/Documentation/DocBook/media/
 	cp -fR include $TempDevelRoot
 	# ln -s ../generated/uapi/linux/version.h $TempDevelRoot/include/linux/version.h
 	cp -fR scripts $TempDevelRoot
@@ -1271,6 +1300,7 @@ SaveDevel() {
 	%ifarch %{ix86} x86_64
 		cp -fR arch/x86/kernel/asm-offsets.{c,s} $TempDevelRoot/arch/x86/kernel/
 		cp -fR arch/x86/kernel/asm-offsets_{32,64}.c $TempDevelRoot/arch/x86/kernel/
+		cp -fR arch/x86/purgatory/* $TempDevelRoot/arch/x86/purgatory/
 		cp -fR arch/x86/syscalls/syscall* $TempDevelRoot/arch/x86/syscalls/
 		cp -fR arch/x86/include $TempDevelRoot/arch/x86/
 		cp -fR arch/x86/tools $TempDevelRoot/arch/x86/
@@ -1308,13 +1338,14 @@ SaveDevel() {
 %endif
 
 	for i in alpha arc avr32 blackfin c6x cris frv h8300 hexagon ia64 m32r m68k m68knommu metag microblaze \
-		 mips mn10300 openrisc parisc powerpc s390 score sh sparc tile unicore32 xtensa; do
+		 mips mn10300 nios2 openrisc parisc powerpc s390 score sh sparc tile unicore32 xtensa; do
 		rm -rf $TempDevelRoot/arch/$i
 	done
 
 	%ifnarch %{arm}
 		rm -rf $TempDevelRoot/arch/arm*
 		rm -rf $TempDevelRoot/include/kvm/arm*
+		rm -rf $TempDevelRoot/include/soc
 	%endif
 	%ifnarch %{ix86} x86_64
 		rm -rf $TempDevelRoot/arch/x86
@@ -1370,6 +1401,7 @@ $DevelRoot/include/drm
 $DevelRoot/include/dt-bindings
 $DevelRoot/include/generated
 $DevelRoot/include/keys
+$DevelRoot/include/kvm
 $DevelRoot/include/linux
 $DevelRoot/include/math-emu
 $DevelRoot/include/media
@@ -1381,6 +1413,9 @@ $DevelRoot/include/ras
 $DevelRoot/include/rdma
 $DevelRoot/include/rxrpc
 $DevelRoot/include/scsi
+%ifarch %{arm}
+$DevelRoot/include/soc
+%endif
 $DevelRoot/include/sound
 $DevelRoot/include/target
 $DevelRoot/include/trace
@@ -1719,7 +1754,13 @@ LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{rpmrel}/" Makefile
 ### Linker start3 > Check point to build for omv or rosa ###
 ############################################################
 %if %{build_perf}
-%smake -C tools/perf -s HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} all
+%ifarch x86_64
+%define perf_is_x64	1
+%else
+%define perf_is_x64	0
+%endif
+
+%smake -C tools/perf -s IS_X86_64=%{perf_is_x64} HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} all
 %smake -C tools/perf -s prefix=%{_prefix} man
 %endif
 
@@ -1769,7 +1810,7 @@ chmod -R a+rX %{target_source}
 # we remove all the source files that we don't ship
 # first architecture files
 for i in alpha arc avr32 blackfin c6x cris frv h8300 hexagon ia64 m32r m68k m68knommu metag microblaze \
-	 mips openrisc parisc powerpc s390 score sh sh64 sparc tile unicore32 v850 xtensa mn10300; do
+	 mips nios2 openrisc parisc powerpc s390 score sh sh64 sparc tile unicore32 v850 xtensa mn10300; do
 	rm -rf %{target_source}/arch/$i
 done
 %ifnarch %{arm}
@@ -1825,10 +1866,10 @@ LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{rpmrel}/" Makefile
 %if %{build_perf}
 
 # perf tool binary and supporting scripts/binaries
-make -C tools/perf -s V=1 DESTDIR=%{buildroot} HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} install
+make -C tools/perf -s V=1 DESTDIR=%{buildroot} IS_X86_64=%{perf_is_x64} HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} install
 
 # perf man pages (note: implicit rpm magic compresses them later)
-make -C tools/perf  -s V=1 DESTDIR=%{buildroot} HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} install-man
+make -C tools/perf  -s V=1 DESTDIR=%{buildroot} IS_X86_64=%{perf_is_x64} HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} install-man
 %endif
 
 ############################################################
@@ -1891,6 +1932,7 @@ rm -rf %{buildroot}
 %{_kerneldir}/include/drm
 %{_kerneldir}/include/dt-bindings
 %{_kerneldir}/include/keys
+%{_kerneldir}/include/kvm
 %{_kerneldir}/include/linux
 %{_kerneldir}/include/math-emu
 %{_kerneldir}/include/media
@@ -1902,6 +1944,7 @@ rm -rf %{buildroot}
 %{_kerneldir}/include/rdma
 %{_kerneldir}/include/rxrpc
 %{_kerneldir}/include/scsi
+%{_kerneldir}/include/soc
 %{_kerneldir}/include/sound
 %{_kerneldir}/include/target
 %{_kerneldir}/include/trace
@@ -1941,6 +1984,9 @@ rm -rf %{buildroot}
 %if %{build_perf}
 %files -n perf
 %{_bindir}/perf
+%ifarch x86_64
+%{_bindir}/perf-read-vdso32
+%endif
 %{_bindir}/trace
 %dir %{_prefix}/libexec/perf-core
 %{_libdir}/libperf-gtk.so
diff --git a/linux-3.14.tar.sign b/linux-3.14.tar.sign
deleted file mode 100644
index 321b9f1..0000000
--- a/linux-3.14.tar.sign
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQEcBAABAgAGBQJTOOUkAAoJEHm+PkMAQRiGRzUH/RTLPnnpw/jo13GAXnAAwesO
-k8Bb1YnkLLkRoOU5tIatQxUn6uDEtkZMcAA4GbTin58gIzBlfrdDOtrOnWoerKaJ
-2Gbltrf4B6Y/nQWFPAJR6CQLNc/0cl4Djh8sUQ/wDt2XzpExbIUg2nOmq/Bk8v5t
-wW9YFAhS0kar3bhTCKk1fyNf4uHxBTzNMnTAumZjMqoKjXo58uxwqwp5SrAOrcJU
-a1M7rqUo2ZPrKj453LM296naGBInM3/yGQhFBJCmhIPTLg+ekrXDIQREZkPsb8R8
-NeLSzyHbGqf6x0bhyUi4gunQRcTXMIUI5p6NzsPGnJep95hfrZal5lNnHeZzqeM=
-=xfKd
------END PGP SIGNATURE-----
diff --git a/linux-4.1.tar.sign b/linux-4.1.tar.sign
new file mode 100644
index 0000000..ec8083a
--- /dev/null
+++ b/linux-4.1.tar.sign
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEcBAABAgAGBQJVh5nCAAoJEHm+PkMAQRiG4+oIAIXe2H1ekRRwkzx/wBwTBtoW
+NVLeyqA8JpNcBKT26Gut3SaRQ2mVZa9j+kb5un7WAm8cEXtMBiJOCW6ywh029tg7
+2j0/3EfX384erR3+Z5cgBZoExZWrReZc52YcrEnndBZSj3wcjM4zIan7Ec9xEGpx
+2pnZuhZx1M0rW2Yc/5GdiYWqfSi0ZASPUzgOx6WPxjAuzfqXL1OxR9wU7M4K0fH7
+fykAI3024h+WEvRW+P5eQ45twJdRUuRkKxTDPZhkPF+pUqLz5akuwlcvFyXiDv+1
+iWsN02ApEkcmWkzbaaxTEGuCsBtRPEAdhpP82VFRpvokytCwJaQAPCScxg48YX4=
+=rJX5
+-----END PGP SIGNATURE-----
diff --git a/patch-3.14.53.sign b/patch-3.14.53.sign
deleted file mode 100644
index 92d72b6..0000000
--- a/patch-3.14.53.sign
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAABCAAGBQJWADm3AAoJEDjbvchgkmk+DsUQAKQJzMyIXP3IcCG2yug7+PS7
-Wm0JLRv+b+IVI/qxc8WtOz3nj2khnMM0JwjWSqCBPZYty11LLKVDqZ2YjkyMyCl/
-4ql0qiDrrO9RHX020GwrSSxBEisvdq1P5LQ8gBGUEHWNWWnGP+vjjP7ygdkve36k
-Whn5FHXxJdgNOd5z9tco1sE8/+c80EO9TZYYSZAPX8BaxTEtmdW7L0iOSupV2rxv
-mVHWJf46ir/6Nk07QSNGWRc4rFmLU3+bsbnp05nLu08zZOh8hBoCV/GCEhkwZu1k
-4RWbDXgpHrV8tQlxnT42do+rIR6S83u88gz3+anyEx5Ny5DiTk5VfTRP4DoQBdJa
-TDLd2WeQaCt/DybL1TtqqmiFJBdxyofeWE4pYcQjysqgsJl6587ilmaN0y3W1LY1
-Th/b3kXXxPHe5i+WNj6mV+kf7StQBFkptoXC0iYRWuLGo4N5RBWvVW3u5IRKYhVd
-sDbiDauwmp5NAY5mBtClyw0eG/1SfxYDc1Taf4Z3T+zxV8Chp/5Ganx4GxR3FroK
-tp4bO5O3IW7CjiqeUxdJZPEz/avigOp666ma/+YMilv3lAgk77XIZ0T9Iq0nIqDc
-EWGpgR+cM0B16Uqta+TlEYoEIbG68wnuNTO7rkZwcD/BZ+YMTB2K22IMS2xqrnYY
-YCjjKNQ2r9URHz0JVeg+
-=kyBQ
------END PGP SIGNATURE-----
diff --git a/patch-4.1.13.sign b/patch-4.1.13.sign
new file mode 100644
index 0000000..127e09d
--- /dev/null
+++ b/patch-4.1.13.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJWQR93AAoJEDjbvchgkmk+r/wP/RSiL1acbYUDUXXtRCSjKhUt
+o1wI1g50QVriSgnlR+lmlGJUtrZnb3voG5c620Sxj0mJqXAgvo+nUYvtUm0A6KKB
+QrLPaGXWWe6biW1L/1kUcd+fNMt45MFdRSHaL6MYAvZS4r+a6TneRYHddZW72/xl
+GZj/Y75NFeC0wdKMJE0iIcSkpqeI25t+gNeKERFnRGmEMMZDXpxtCefIEFY1isib
+Rn5mWs+4vHaHM6JyOLPx8cjLEplKp4/Bf57VnB5+Wr+vE8/KgcSitJlm2J3LmN6i
+9rQ+q3g4avO5TXL+BtDVL/GC/gHVYPf0xmJ+v0QT42WYfQa15TVa4i+sqryHSljl
+Q+qSWgNc/T/iTvQaYb055LsHWljhd/8WGoW/Vmv7rKdtbKeqH4eYoxF3iwwke3t7
+oB0AQeES80OWoJ7gqzqaK7XjraLlXAz1lBgbe83GhmnXXchz8QsT2oZRw6+CqYlk
+un/b9lJrbG4lozgVEXFXbjxr2RfxF7W7SOOmD7cZeUEkqpJWoQiExz5IKBm+Px+q
+CCMnMP6/hybyF+kMm2yfX/cy9i2b1CY80vlMugVPXnUEcqxpOHElnKpQwn9YxsLA
+bZvRG+90kOifm4d4BaNR4DtK2n8LXjSsLYps560DQsAOx79erlR44sLVnvlrahwq
+xe5IZggmz1D8DsIBbOxq
+=hWU8
+-----END PGP SIGNATURE-----