Merge pull request #152 from ertugerata/master

alfa6 Lost Cat coming...

README.md

@@ -1,9 +1,8 @@
 # core
 core repository
 ------------------------------------------------------------------------------
-* Bu bir deneysel çalışmadır. 
-* Lütfen sonuçlarına katlanamayacaksanız ilgilenmeyin.
 * Buradan derlenen pisi dosyalarını **Pisi-1.* serisi üzerine kurmayınız.**
+* Pisi-1. sürüm pisi dosyalarını **pisi-2.0 kurulu sistemlere kurmayınız.** 
 
 ------------------------------------------------------------------------------
 

distribution.xml

@@ -186,7 +186,6 @@
         <Package>qedje</Package>
         <Package>ushare</Package>
         <Package>udev-32bit</Package>
-        <Package>kde-l10n-fa</Package>
         <Package>kde-l10n-si</Package>
         <Package>kde-l10n-si-doc</Package>
         <Package>kde-l10n-tg</Package>

find-packages-not-compiled-in-farm

@@ -16,7 +16,7 @@ import lzma
 import piksemel
 
 pisirepouri = "http://ciftlik.pisilinux.org/pisi-2.0/pisi-index.xml.xz"
-svnrepouri  = "https://github.com/pisilinux/core/raw/master/pisi-index.xml.xz"
+svnrepouri  = "https://github.com/ertugerata/core/raw/master/pisi-index.xml.xz"
 
 def getIndex(uri):
     try:

hardware/firmware/linux-firmware/pspec.xml

@@ -17,8 +17,8 @@
         <IsA>data</IsA>
         <Summary>Firmware files used by the Linux kernel</Summary>
         <Description>linux-firmware contains different firmware files required for some devices to operate correctly.</Description>
-        <!-- linux-firmware commit:  commit e10097aa1b4ab3f4ed96b05142868f093a009643 2015-07-16 -->
-        <Archive sha1sum="0d59830cabba714840a23b2a359cad8d172fd0eb" type="tarbz2">http://source.pisilinux.org/1.0/linux-firmware/linux-firmware-20150716.tar.bz2</Archive>
+        <!-- linux-firmware commit:  commit  f88e5c2e2ff57026ce8028ba4dde8e7325f251a4 2015-09-24 -->
+        <Archive sha1sum="053e48266c07116bf86d0848655e9c0c02076609" type="tarbz2">http://source.pisilinux.org/1.0/linux-firmware/linux-firmware-20150924.tar.bz2</Archive>
         <Archive sha1sum="dd685266f7bc0acb0d455462637d23e3e895bc96" type="tarxz" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/common-fw.tar.xz</Archive>
         <Archive sha1sum="b2bb7fce3ea67d131f543a48134f7a65f2a8d834" type="tarxz" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware-ipw.tar.xz</Archive>
         <Archive sha1sum="a5a616a9f765cf9cbb224deb7ccefdc82a7fe4d9" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/firmware-nonfreebox-2-tar.bz2</Archive>
@@ -31,13 +31,9 @@
         <Archive sha1sum="5d333e75f02a57861565337c14f6944090a242a8" type="tarxz" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/nouveau-1.tar.xz</Archive>
         <AdditionalFiles>
             <AdditionalFile target="intel/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq">fw/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq</AdditionalFile>
+            <AdditionalFile target="iwlwifi-7260-14.ucode">iwlwifi-7260-14.ucode</AdditionalFile>
+            <AdditionalFile target="iwlwifi-7260-15.ucode">iwlwifi-7260-15.ucode</AdditionalFile>
         </AdditionalFiles>
-        <!--<BuildDependencies>
-            <Dependency>rpm2targz</Dependency>
-        </BuildDependencies>-->
-        <Patches>
-            <!-- Remove all patches, all dead :) -->
-        </Patches>
     </Source>
 
     <Package>
@@ -52,6 +48,20 @@
     </Package>
 
     <History>
+        <Update release="19">
+            <Date>2015-09-06</Date>
+            <Version>20150924</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+         <Update release="18">
+            <Date>2015-09-06</Date>
+            <Version>20150824</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
           <Update release="17">
             <Date>2015-07-20</Date>
             <Version>20150716</Version>

kernel/drivers/module-bbswitch/pspec.xml

@@ -11,7 +11,7 @@
         <Summary>Kernel module allowing to switch dedicated graphics card on Optimus laptops</Summary>
         <Description>kernel module allowing to switch dedicated graphics card on Optimus laptops</Description>
         <BuildDependencies>
-            <Dependency version="4.1.3">kernel-module-headers</Dependency>
+            <Dependency version="4.2.5">kernel-module-headers</Dependency>
         </BuildDependencies>
         <Archive sha1sum="e282ee682d794e3962baa4dead01917c42571e78" type="targz">https://github.com/Bumblebee-Project/bbswitch/archive/v0.8.tar.gz</Archive>
         <Patches>
@@ -20,7 +20,7 @@
     <Package>
         <Name>module-bbswitch</Name>
         <RuntimeDependencies>
-            <Dependency version="4.1.3">kernel</Dependency>
+            <Dependency version="4.2.5">kernel</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library" permanent="true">/lib/modules</Path>
@@ -34,6 +34,62 @@
     </Package>
 
     <History>
+        <Update release="33">
+            <Date>2015-11-30</Date>
+            <Version>0.8</Version>
+            <Comment>Rebuild for kernel-4.2.5.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+         <Update release="32">
+            <Date>2015-11-27</Date>
+            <Version>0.8</Version>
+            <Comment>Rebuild for kernel-4.2.4.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+         <Update release="31">
+            <Date>2015-10-05</Date>
+            <Version>0.8</Version>
+            <Comment>Rebuild for kernel-4.2.3.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>        
+        <Update release="30">
+            <Date>2015-10-01</Date>
+            <Version>0.8</Version>
+            <Comment>Rebuild for kernel-4.2.2.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="29">
+            <Date>2015-09-23</Date>
+            <Version>0.8</Version>
+            <Comment>Rebuild for kernel-4.1.8.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="28">
+            <Date>2015-09-18</Date>
+            <Version>0.8</Version>
+            <Comment>Rebuild for kernel-4.1.7.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+           <Update release="27">
+            <Date>2015-08-18</Date>
+            <Version>0.8</Version>
+            <Comment>Rebuild for kernel-4.1.6.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+          <Update release="26">
+            <Date>2015-08-13</Date>
+            <Version>0.8</Version>
+            <Comment>Rebuild for kernel-4.1.5.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
          <Update release="25">
             <Date>2015-07-23</Date>
             <Version>0.8</Version>

kernel/drivers/module-broadcom-wl/files/patch/0018-cfg80211_disconnected.patch

@@ -0,0 +1,29 @@
+From b14ac6e4b871b5e15f63389ba63d1fc23a54c58b Mon Sep 17 00:00:00 2001
+From: Tim Gardner <tim.gardner@canonical.com>
+Date: Tue, 4 Aug 2015 09:02:10 -0600
+Subject: [PATCH] cfg80211_disconnected
+
+Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
+---
+ bcmwl-6.30.223.248+bdcom/src/src/wl/sys/wl_cfg80211_hybrid.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
+index ea0726f..0131f01 100644
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -2047,7 +2047,11 @@ wl_notify_connect_status(struct wl_cfg80211_priv *wl, struct net_device *ndev,
+ 		}
+ 		else if ((event == WLC_E_LINK && ~(flags & WLC_EVENT_MSG_LINK)) ||
+ 			event == WLC_E_DEAUTH_IND || event == WLC_E_DISASSOC_IND) {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
+ 			cfg80211_disconnected(ndev, 0, NULL, 0, GFP_KERNEL);
++#else
++			cfg80211_disconnected(ndev, 0, NULL, 0, false, GFP_KERNEL);
++#endif
+ 			clear_bit(WL_STATUS_CONNECTED, &wl->status);
+ 			wl_link_down(wl);
+ 			wl_init_prof(wl->profile);
+-- 
+2.5.0
+

kernel/drivers/module-broadcom-wl/files/patch/0019-broadcom-sta-6.30.223.248-3.18-null-pointer-fix.patch

@@ -0,0 +1,27 @@
+Description: Fixing null pointer crash
+
+Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=773713
+Bug-Ubuntu: https://launchpad.net/bugs/1415880
+Last-Update: 2015-08-18
+
+---
+ src/wl/sys/wl_linux.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+index 860b935..295156f 100644
+--- a/src/wl/sys/wl_linux.c
++++ b/src/wl/sys/wl_linux.c
+@@ -2157,8 +2157,8 @@ wl_start(struct sk_buff *skb, struct net_device *dev)
+ 	wlif = WL_DEV_IF(dev);
+ 	wl = WL_INFO(dev);
+ 
++	skb->prev = NULL;
+ 	if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) {
+-		skb->prev = NULL;
+ 
+ 		TXQ_LOCK(wl);
+ 
+-- 
+1.9.1
+

kernel/drivers/module-broadcom-wl/pspec.xml

@@ -15,7 +15,7 @@
         <Archive sha1sum="e02beac9cc713011551c483ae5f20f065f5b88c7" type="targz" target="i686">http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_248.tar.gz</Archive>
         <Archive sha1sum="bd55f1fdc6b0a4d0a70dc4ba4bb4169a824e238c" type="targz" target="x86_64">http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_248.tar.gz</Archive>
         <BuildDependencies>
-            <Dependency version="4.1.3">kernel-module-headers</Dependency>
+            <Dependency version="4.2.5">kernel-module-headers</Dependency>
         </BuildDependencies>
         <Patches>
             <Patch level="1">patch/linux-40.patch</Patch>
@@ -24,13 +24,15 @@
             <Patch level="1">patch/gcc.patch</Patch>
             <Patch level="1">patch/wlan.patch</Patch>
             <Patch level="1">patch/broadcom-sta-6.30.223.248-linux-3.18-null-pointer-crash.patch</Patch>
+            <Patch>patch/0018-cfg80211_disconnected.patch</Patch>
+            <!--Patch>patch/0019-broadcom-sta-6.30.223.248-3.18-null-pointer-fix.patch</Patch-->
         </Patches>
     </Source>
 
     <Package>
         <Name>module-broadcom-wl</Name>
         <RuntimeDependencies>
-            <Dependency version="4.1.3">kernel</Dependency>
+            <Dependency version="4.2.5">kernel</Dependency>
             <Dependency release="current">module-broadcom-wl-userspace</Dependency>
         </RuntimeDependencies>
         <Replaces>
@@ -62,7 +64,63 @@
     </Package>
 
     <History>
-          <Update release="45">
+        <Update release="53">
+            <Date>2015-11-30</Date>
+            <Version>6.30.223.248</Version>
+            <Comment>Rebuild for kernel 4.2.5.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="52">
+            <Date>2015-11-27</Date>
+            <Version>6.30.223.248</Version>
+            <Comment>Rebuild for kernel 4.2.4.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="51">
+            <Date>2015-10-05</Date>
+            <Version>6.30.223.248</Version>
+            <Comment>Rebuild for kernel 4.2.3.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>        
+        <Update release="50">
+            <Date>2015-10-01</Date>
+            <Version>6.30.223.248</Version>
+            <Comment>Rebuild for kernel 4.2.2.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+        <Update release="49">
+            <Date>2015-09-23</Date>
+            <Version>6.30.223.248</Version>
+            <Comment>Rebuild for kernel 4.1.8.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+        <Update release="48">
+            <Date>2015-09-18</Date>
+            <Version>6.30.223.248</Version>
+            <Comment>Rebuild for kernel 4.1.7.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+         <Update release="47">
+            <Date>2015-08-18</Date>
+            <Version>6.30.223.248</Version>
+            <Comment>Rebuild for kernel 4.1.6.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+         <Update release="46">
+            <Date>2015-08-13</Date>
+            <Version>6.30.223.248</Version>
+            <Comment>Rebuild for kernel 4.1.5.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+         <Update release="45">
             <Date>2015-07-23</Date>
             <Version>6.30.223.248</Version>
             <Comment>Rebuild for kernel 4.1.3.</Comment>

kernel/drivers/module-virtualbox-guest/pspec.xml

@@ -12,16 +12,16 @@
         <IsA>driver</IsA>
         <Summary>Kernel modules for VirtualBox guest machines</Summary>
         <Description>This package provides the kernel modules needed for mouse integration and shared folder support between VirtualBox host and guest systems.</Description>
-        <Archive sha1sum="82194515516139801fdc690198495b043d1c9cbe" type="tarxz">http://source.pisilinux.org/1.0/module-virtualbox-guest-4.3.28.tar.xz</Archive>
+        <Archive sha1sum="cd1f7c62e17ef3d9b5f7aef7d83fd160355eb396" type="tarxz">http://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-guest-5.0.4.tar.xz</Archive>
         <BuildDependencies>
-            <Dependency version="4.1.3">kernel-module-headers</Dependency>
+            <Dependency version="4.2.5">kernel-module-headers</Dependency>
         </BuildDependencies>
     </Source>
 
     <Package>
         <Name>module-virtualbox-guest</Name>
         <RuntimeDependencies>
-            <Dependency version="4.1.3">kernel</Dependency>
+            <Dependency version="4.2.5">kernel</Dependency>
             <Dependency>baselayout</Dependency>
             <Dependency version="current">module-virtualbox-guest-userspace</Dependency>
         </RuntimeDependencies>
@@ -51,22 +51,71 @@
         </BuildFlags>
     </Package>
 
-    <History>   
-         <Update release="47">
+    <History>
+        <Update release="54">
+            <Date>2015-11-30</Date>
+            <Version>5.0.4</Version>
+            <Comment>Rebuild for kernel-4.2.5.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="53">
+            <Date>2015-11-27</Date>
+            <Version>5.0.4</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="52">
+            <Date>2015-10-05</Date>
+            <Version>4.3.28</Version>
+            <Comment>Rebuild for kernel-4.2.3.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="51">
+            <Date>2015-10-01</Date>
+            <Version>4.3.28</Version>
+            <Comment>Rebuild for kernel-4.2.2.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="50">
+            <Date>2015-08-23</Date>
+            <Version>4.3.28</Version>
+            <Comment>Rebuild for kernel-4.1.8.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="49">
+            <Date>2015-08-18</Date>
+            <Version>4.3.28</Version>
+            <Comment>Rebuild for kernel-4.1.7.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update> 
+        <Update release="48">
+            <Date>2015-08-13</Date>
+            <Version>4.3.28</Version>
+            <Comment>Rebuild for kernel-4.1.5.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>       
+        <Update release="47">
             <Date>2015-07-23</Date>
             <Version>4.3.28</Version>
             <Comment>Rebuild for kernel-4.1.3.</Comment>
             <Name>Ertuğrul Erata</Name>
             <Email>ertugrulerata@gmail.com</Email>
-         </Update>      
-         <Update release="46">
+        </Update>      
+        <Update release="46">
             <Date>2015-07-20</Date>
             <Version>4.3.28</Version>
             <Comment>Rebuild for kernel-4.1.2.</Comment>
             <Name>Ertuğrul Erata</Name>
             <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="45">
+        </Update>
+        <Update release="45">
             <Date>2015-07-13</Date>
             <Version>4.3.28</Version>
             <Comment>Rebuild for kernel-4.0.8.</Comment>

kernel/drivers/module-virtualbox/pspec.xml

@@ -12,16 +12,16 @@
         <IsA>driver</IsA>
         <Summary>Kernel modules for VirtualBox</Summary>
         <Description>This package provides the kernel support for VirtualBox.</Description>
-        <Archive sha1sum="8850ebc24e00640835b682a5f8bbc8f05313d2d7" type="tarxz">http://source.pisilinux.org/1.0/module-virtualbox-4.3.28.tar.xz</Archive>
+        <Archive sha1sum="14e3d8630f779dc1349d9aa488fa7e6604b9ba3e" type="tarxz">http://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-5.0.4.tar.xz</Archive>
         <BuildDependencies>
-            <Dependency version="4.1.3">kernel-module-headers</Dependency>
+            <Dependency version="4.2.5">kernel-module-headers</Dependency>
         </BuildDependencies>
     </Source>
 
     <Package>
         <Name>module-virtualbox</Name>
         <RuntimeDependencies>
-            <Dependency version="4.1.3">kernel</Dependency>
+            <Dependency version="4.2.5">kernel</Dependency>
             <Dependency version="current">module-virtualbox-userspace</Dependency>
         </RuntimeDependencies>
         <Files>
@@ -47,21 +47,77 @@
     </Package>
 
     <History>
-           <Update release="49">
+        <Update release="57">
+            <Date>2015-11-30</Date>
+            <Version>5.0.4</Version>
+            <Comment>Rebuild for kernel-4.2.5.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+        <Update release="56">
+            <Date>2015-11-27</Date>
+            <Version>5.0.4</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+        <Update release="55">
+            <Date>2015-10-05</Date>
+            <Version>4.3.28</Version>
+            <Comment>Rebuild for kernel-4.2.3.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+        <Update release="54">
+            <Date>2015-10-01</Date>
+            <Version>4.3.28</Version>
+            <Comment>Rebuild for kernel-4.2.2.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+        <Update release="53">
+            <Date>2015-09-23</Date>
+            <Version>4.3.28</Version>
+            <Comment>Rebuild for kernel-4.1.8.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+          <Update release="52">
+            <Date>2015-09-18</Date>
+            <Version>4.3.28</Version>
+            <Comment>Rebuild for kernel-4.1.7.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+         <Update release="51">
+            <Date>2015-08-18</Date>
+            <Version>4.3.28</Version>
+            <Comment>Rebuild for kernel-4.1.6.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+         <Update release="50">
+            <Date>2015-08-13</Date>
+            <Version>4.3.28</Version>
+            <Comment>Rebuild for kernel-4.1.5.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+         <Update release="49">
             <Date>2015-07-23</Date>
             <Version>4.3.28</Version>
             <Comment>Rebuild for kernel-4.1.3.</Comment>
             <Name>Ertuğrul Erata</Name>
             <Email>ertugrulerata@gmail.com</Email>
-          </Update>
-          <Update release="48">
+         </Update>
+         <Update release="48">
             <Date>2015-07-20</Date>
             <Version>4.3.28</Version>
             <Comment>Rebuild for kernel-4.1.2.</Comment>
             <Name>Ertuğrul Erata</Name>
             <Email>ertugrulerata@gmail.com</Email>
-          </Update>
-          <Update release="47">
+         </Update>
+         <Update release="47">
             <Date>2015-07-13</Date>
             <Version>4.3.28</Version>
             <Comment>Rebuild for kernel-4.0.8.</Comment>

kernel/drivers/ndiswrapper/actions.py

@@ -14,14 +14,20 @@ KDIR = kerneltools.getKernelVersion()
 
 def build():
     shelltools.system("patch -p1 < ndiswrapper-1.59.patch")
-
+    shelltools.system("patch -p1 < kernel-4.2.patch")
+    
     autotools.make("-C driver KVERS_UNAME=%s" % KDIR)
 
     autotools.make("-C utils")
 
 def install():
-    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-
+    pisitools.insinto("/lib/modules/%s/extra" % KDIR, "*/*.ko")
+    pisitools.dosbin("utils/ndiswrapper*", "/usr/sbin")
+    pisitools.dosbin("utils/loadndisdriver", "/sbin")
+    
+    # add man
+    pisitools.doman("*.8")
+    
     pisitools.dodir("/etc/ndiswrapper")
 
     pisitools.dodoc("README", "AUTHORS", "ChangeLog")

kernel/drivers/ndiswrapper/files/kernel-4.2.patch

@@ -0,0 +1,33 @@
+diff -Npur "ndiswrapper-1 .59.orig/driver/loader.c" "ndiswrapper-1 .59/driver/loader.c"
+--- "ndiswrapper-1 .59.orig/driver/loader.c"	2013-11-28 20:42:35.000000000 +0100
++++ "ndiswrapper-1 .59/driver/loader.c"	2015-08-01 18:25:08.302141265 +0200
+@@ -22,6 +22,7 @@
+ #include <linux/kmod.h>
+ #include <linux/miscdevice.h>
+ #include <asm/uaccess.h>
++#include <linux/vmalloc.h>
+ 
+ /*
+   Network adapter: ClassGuid = {4d36e972-e325-11ce-bfc1-08002be10318}
+diff -Npur "ndiswrapper-1 .59.orig/driver/ntoskernel.c" "ndiswrapper-1 .59/driver/ntoskernel.c"
+--- "ndiswrapper-1 .59.orig/driver/ntoskernel.c"	2013-11-28 20:42:36.000000000 +0100
++++ "ndiswrapper-1 .59/driver/ntoskernel.c"	2015-08-01 18:24:55.895942032 +0200
+@@ -19,6 +19,7 @@
+ #include "pnp.h"
+ #include "loader.h"
+ #include "ntoskernel_exports.h"
++#include <linux/vmalloc.h>
+ 
+ /* MDLs describe a range of virtual address with an array of physical
+  * pages right after the header. For different ranges of virtual
+diff -Npur "ndiswrapper-1 .59.orig/driver/pe_linker.c" "ndiswrapper-1 .59/driver/pe_linker.c"
+--- "ndiswrapper-1 .59.orig/driver/pe_linker.c"	2013-11-28 20:42:36.000000000 +0100
++++ "ndiswrapper-1 .59/driver/pe_linker.c"	2015-08-01 18:28:37.992752176 +0200
+@@ -25,6 +25,7 @@
+ //#define DEBUGLINKER 2
+ 
+ #include "ntoskernel.h"
++#include <linux/vmalloc.h>
+ 
+ #endif
+ 

kernel/drivers/ndiswrapper/files/support_kernel-4.0.patch

@@ -0,0 +1,41 @@
+From: Julian Andres Klode <jak@debian.org>
+Date: Tue, 12 May 2015 17:11:11 +0200
+Subject: Support kernel 4.0
+
+---
+ driver/ndis.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/driver/ndis.c b/driver/ndis.c
+index 9ace34b..fafd2e7 100644
+--- a/driver/ndis.c
++++ b/driver/ndis.c
+@@ -25,6 +25,10 @@
+ #define MAX_ALLOCATED_NDIS_PACKETS TX_RING_SIZE
+ #define MAX_ALLOCATED_NDIS_BUFFERS TX_RING_SIZE
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
++#define strncasecmp strnicmp
++#endif
++
+ static struct work_struct ndis_work;
+ static struct nt_list ndis_work_list;
+ static spinlock_t ndis_work_list_lock;
+@@ -438,7 +442,7 @@ static int read_setting(struct nt_list *setting_list, char *keyname, int length,
+ 	struct wrap_device_setting *setting;
+ 	mutex_lock(&loader_mutex);
+ 	nt_list_for_each_entry(setting, setting_list, list) {
+-		if (strnicmp(keyname, setting->name, length) == 0) {
++		if (strncasecmp(keyname, setting->name, length) == 0) {
+ 			TRACE2("setting %s='%s'", keyname, setting->value);
+ 			mutex_unlock(&loader_mutex);
+ 			*param = ndis_encode_setting(setting, type);
+@@ -502,7 +506,7 @@ wstdcall void WIN_FUNC(NdisWriteConfiguration,4)
+ 
+ 	mutex_lock(&loader_mutex);
+ 	nt_list_for_each_entry(setting, &nmb->wnd->wd->settings, list) {
+-		if (strnicmp(keyname, setting->name, ansi.length) == 0) {
++		if (strncasecmp(keyname, setting->name, ansi.length) == 0) {
+ 			mutex_unlock(&loader_mutex);
+ 			if (ndis_decode_setting(setting, param))
+ 				*status = NDIS_STATUS_FAILURE;

kernel/drivers/ndiswrapper/pspec.xml

@@ -15,17 +15,21 @@
         <Description>module-ndiswrapper allows you to use Windows XP drivers for WLAN cards without proper Linux drivers.</Description>
         <Archive sha1sum="75fbbda677fe91ee07a6f6a8e19b1f3e2479540f" type="targz">http://download.sourceforge.net/ndiswrapper/ndiswrapper-1.59.tar.gz</Archive>
         <BuildDependencies>
-             <Dependency version="4.1.2">kernel-module-headers</Dependency>
+             <Dependency version="4.2.5">kernel-module-headers</Dependency>
         </BuildDependencies>
+        <Patches>
+            <Patch>support_kernel-4.0.patch</Patch>
+        </Patches>
          <AdditionalFiles>
             <AdditionalFile target="ndiswrapper-1.59.patch">ndiswrapper-1.59.patch</AdditionalFile>
+            <AdditionalFile target="kernel-4.2.patch">kernel-4.2.patch</AdditionalFile>
         </AdditionalFiles>
     </Source>
 
     <Package>
         <Name>ndiswrapper</Name>
         <RuntimeDependencies>
-            <Dependency version="4.1.2">kernel</Dependency>
+            <Dependency version="4.2.5">kernel</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library" permanent="true">/lib/modules</Path>
@@ -35,11 +39,56 @@
             <Path fileType="executable">/sbin</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
+        <BuildFlags>
+            <Flag>noDelta</Flag>
+        </BuildFlags>
     </Package>
 
     <History>
+        <Update release="7">
+            <Date>2014-11-30</Date>
+            <Version>1.59</Version>
+            <Comment>Rebuild for kernel-4.2.5.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Update>
+        <Update release="6">
+            <Date>2014-11-27</Date>
+            <Version>1.59</Version>
+            <Comment>Rebuild for kernel-4.2.4.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Update>
+        <Update release="5">
+            <Date>2014-10-05</Date>
+            <Version>1.59</Version>
+            <Comment>Rebuild for kernel-4.2.3.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Update>
+        <Update release="4">
+            <Date>2014-10-01</Date>
+            <Version>1.59</Version>
+            <Comment>Rebuild for kernel-4.2.2.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Update>
+        <Update release="3">
+            <Date>2014-09-23</Date>
+            <Version>1.59</Version>
+            <Comment>Rebuild for kernel-4.1.8.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Update>
+        <Update release="2">
+            <Date>2014-08-18</Date>
+            <Version>1.59</Version>
+            <Comment>Rebuild for kernel-4.1.6.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Update>
         <Update release="1">
-            <Date>2014-04-28</Date>
+            <Date>2014-08-13</Date>
             <Version>1.59</Version>
             <Comment>First release</Comment>
             <Name>PisiLinux Community</Name>

kernel/kernel/files/configs/kernel-x86_64-config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.1.3 Kernel Configuration
+# Linux/x86_64 4.2.5 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -37,7 +37,6 @@ CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_64_SMP=y
-CONFIG_X86_HT=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_FIX_EARLYCON_MEM=y
@@ -86,11 +85,12 @@ CONFIG_AUDIT_TREE=y
 #
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_LEGACY_ALLOC_HWIRQ=y
 CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
@@ -131,18 +131,11 @@ CONFIG_TASK_IO_ACCOUNTING=y
 # RCU Subsystem
 #
 CONFIG_TREE_RCU=y
+# CONFIG_RCU_EXPERT is not set
 CONFIG_SRCU=y
 # CONFIG_TASKS_RCU is not set
 CONFIG_RCU_STALL_COMMON=y
-CONFIG_CONTEXT_TRACKING=y
-CONFIG_RCU_USER_QS=y
-CONFIG_CONTEXT_TRACKING_FORCE=y
-CONFIG_RCU_FANOUT=64
-CONFIG_RCU_FANOUT_LEAF=16
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_RCU_FAST_NO_HZ is not set
 # CONFIG_TREE_RCU_TRACE is not set
-CONFIG_RCU_KTHREAD_PRIO=0
 CONFIG_RCU_NOCB_CPU=y
 # CONFIG_RCU_NOCB_CPU_NONE is not set
 # CONFIG_RCU_NOCB_CPU_ZERO is not set
@@ -177,6 +170,7 @@ CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_BLK_CGROUP=y
 # CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_CGROUP_WRITEBACK=y
 # CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
@@ -261,6 +255,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
@@ -292,6 +287,7 @@ CONFIG_HAVE_ARCH_SOFT_DIRTY=y
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_COPY_THREAD_TLS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
 
@@ -312,6 +308,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_MODULE_SIG is not set
 # CONFIG_MODULE_COMPRESS is not set
+CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
 CONFIG_BLK_DEV_BSG=y
@@ -368,8 +365,10 @@ CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_ARCH_USE_QUEUE_RWLOCK=y
-CONFIG_QUEUE_RWLOCK=y
+CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
+CONFIG_QUEUED_SPINLOCKS=y
+CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
+CONFIG_QUEUED_RWLOCKS=y
 CONFIG_FREEZER=y
 
 #
@@ -515,6 +514,8 @@ CONFIG_ZPOOL=y
 # CONFIG_ZBUD is not set
 # CONFIG_ZSMALLOC is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
+CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
+# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 # CONFIG_X86_PMEM_LEGACY is not set
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -587,6 +588,7 @@ CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
 CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS_POWER is not set
+CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
 CONFIG_ACPI_EC_DEBUGFS=m
 CONFIG_ACPI_AC=y
 CONFIG_ACPI_BATTERY=y
@@ -613,6 +615,7 @@ CONFIG_ACPI_HED=y
 CONFIG_ACPI_CUSTOM_METHOD=m
 CONFIG_ACPI_BGRT=y
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
+# CONFIG_ACPI_NFIT is not set
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
 CONFIG_ACPI_APEI=y
@@ -696,6 +699,7 @@ CONFIG_PCIEASPM_DEFAULT=y
 CONFIG_PCIE_PME=y
 CONFIG_PCI_BUS_ADDR_T_64BIT=y
 CONFIG_PCI_MSI=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
 # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
 CONFIG_PCI_STUB=y
 CONFIG_XEN_PCIDEV_FRONTEND=m
@@ -757,6 +761,7 @@ CONFIG_X86_DEV_DMA_OPS=y
 CONFIG_PMC_ATOM=y
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
+CONFIG_NET_INGRESS=y
 
 #
 # Networking options
@@ -797,7 +802,7 @@ CONFIG_NET_IPVTI=m
 CONFIG_NET_UDP_TUNNEL=m
 # CONFIG_NET_FOU is not set
 # CONFIG_NET_FOU_IP_TUNNELS is not set
-# CONFIG_GENEVE is not set
+# CONFIG_GENEVE_CORE is not set
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
@@ -824,6 +829,7 @@ CONFIG_TCP_CONG_VENO=m
 CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_CONG_ILLINOIS=m
 # CONFIG_TCP_CONG_DCTCP is not set
+# CONFIG_TCP_CONG_CDG is not set
 CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
@@ -865,6 +871,7 @@ CONFIG_BRIDGE_NETFILTER=m
 #
 # Core Netfilter Configuration
 #
+CONFIG_NETFILTER_INGRESS=y
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_ACCT=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
@@ -911,6 +918,7 @@ CONFIG_NF_NAT_TFTP=m
 CONFIG_NF_NAT_REDIRECT=m
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_INET=m
+# CONFIG_NF_TABLES_NETDEV is not set
 CONFIG_NFT_EXTHDR=m
 CONFIG_NFT_META=m
 CONFIG_NFT_CT=m
@@ -1292,6 +1300,7 @@ CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_CLS_CGROUP=y
 CONFIG_NET_CLS_BPF=m
+# CONFIG_NET_CLS_FLOWER is not set
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_CMP=m
@@ -1447,8 +1456,10 @@ CONFIG_BT_DEBUGFS=y
 #
 CONFIG_BT_INTEL=m
 CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_BCM=y
+CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
@@ -1504,6 +1515,7 @@ CONFIG_MAC80211_LEDS=y
 CONFIG_MAC80211_DEBUGFS=y
 CONFIG_MAC80211_MESSAGE_TRACING=y
 # CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
 CONFIG_WIMAX=m
 CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_RFKILL=m
@@ -1521,6 +1533,7 @@ CONFIG_CEPH_LIB=m
 CONFIG_NFC=m
 CONFIG_NFC_DIGITAL=m
 CONFIG_NFC_NCI=m
+# CONFIG_NFC_NCI_UART is not set
 CONFIG_NFC_HCI=m
 CONFIG_NFC_SHDLC=y
 
@@ -1542,7 +1555,7 @@ CONFIG_NFC_MRVL=m
 CONFIG_NFC_MRVL_USB=m
 CONFIG_NFC_ST21NFCA=m
 CONFIG_NFC_ST21NFCA_I2C=m
-# CONFIG_NFC_ST21NFCB is not set
+# CONFIG_NFC_ST_NCI is not set
 # CONFIG_NFC_NXP_NCI is not set
 CONFIG_HAVE_BPF_JIT=y
 
@@ -1562,7 +1575,7 @@ CONFIG_FW_LOADER=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
@@ -1656,6 +1669,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
 # CONFIG_MTD_UBI_BLOCK is not set
+# CONFIG_OF is not set
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
@@ -1698,7 +1712,6 @@ CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=16384
 CONFIG_BLK_DEV_RAM_DAX=y
-CONFIG_BLK_DEV_PMEM=m
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -1770,19 +1783,27 @@ CONFIG_VMWARE_VMCI=m
 #
 CONFIG_INTEL_MIC_BUS=m
 
+#
+# SCIF Bus Driver
+#
+# CONFIG_SCIF_BUS is not set
+
 #
 # Intel MIC Host Driver
 #
-CONFIG_INTEL_MIC_HOST=m
 
 #
 # Intel MIC Card Driver
 #
-CONFIG_INTEL_MIC_CARD=m
+
+#
+# SCIF Driver
+#
 CONFIG_GENWQE=m
 CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=1
 # CONFIG_ECHO is not set
 # CONFIG_CXL_BASE is not set
+# CONFIG_CXL_KERNEL_API is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1883,6 +1904,7 @@ CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 CONFIG_FCOE=m
 CONFIG_FCOE_FNIC=m
+# CONFIG_SCSI_SNIC is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_EATA is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -2045,6 +2067,7 @@ CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_CACHE=m
 CONFIG_DM_CACHE_MQ=m
+CONFIG_DM_CACHE_SMQ=m
 CONFIG_DM_CACHE_CLEANER=m
 CONFIG_DM_ERA=m
 CONFIG_DM_MIRROR=y
@@ -2110,8 +2133,8 @@ CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETPOLL=y
 CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_NTB_NETDEV=m
 CONFIG_TUN=m
+# CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_VETH=m
 CONFIG_VIRTIO_NET=m
 # CONFIG_NLMON is not set
@@ -2145,6 +2168,7 @@ CONFIG_VHOST_NET=m
 CONFIG_VHOST_SCSI=m
 CONFIG_VHOST_RING=m
 CONFIG_VHOST=m
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
 
 #
 # Distributed Switch Architecture drivers
@@ -2192,6 +2216,11 @@ CONFIG_BNX2X=m
 CONFIG_BNX2X_SRIOV=y
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
+CONFIG_NET_VENDOR_CAVIUM=y
+# CONFIG_THUNDER_NIC_PF is not set
+# CONFIG_THUNDER_NIC_VF is not set
+# CONFIG_THUNDER_NIC_BGX is not set
+# CONFIG_LIQUIDIO is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
@@ -2223,7 +2252,9 @@ CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_NET_VENDOR_EMULEX=y
 CONFIG_BE2NET=m
+CONFIG_BE2NET_HWMON=y
 CONFIG_BE2NET_VXLAN=y
+CONFIG_NET_VENDOR_EZCHIP=y
 CONFIG_NET_VENDOR_EXAR=y
 CONFIG_S2IO=m
 CONFIG_VXGE=m
@@ -2309,6 +2340,7 @@ CONFIG_8139TOO=m
 CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=m
+CONFIG_NET_VENDOR_RENESAS=y
 CONFIG_NET_VENDOR_RDC=y
 CONFIG_R6040=m
 CONFIG_NET_VENDOR_ROCKER=y
@@ -2324,6 +2356,7 @@ CONFIG_SFC=m
 # CONFIG_SFC_MTD is not set
 CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_SRIOV=y
+CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
@@ -2382,6 +2415,7 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_STE10XP=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_MICREL_PHY=m
+# CONFIG_DP83867_PHY is not set
 CONFIG_FIXED_PHY=y
 CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_GPIO=m
@@ -2620,6 +2654,7 @@ CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 CONFIG_RT2X00_LIB_DEBUGFS=y
 # CONFIG_RT2X00_DEBUG is not set
+# CONFIG_WL_MEDIATEK is not set
 CONFIG_RTL_CARDS=m
 CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
@@ -2660,6 +2695,7 @@ CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 # CONFIG_WAN is not set
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKELB=m
+# CONFIG_IEEE802154_ATUSB is not set
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -2799,6 +2835,7 @@ CONFIG_ISDN_HDLC=m
 # Input device support
 #
 CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=y
 CONFIG_INPUT_FF_MEMLESS=y
 CONFIG_INPUT_POLLDEV=m
 CONFIG_INPUT_SPARSEKMAP=m
@@ -2937,6 +2974,7 @@ CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
 CONFIG_TOUCHSCREEN_UCB1400=m
 CONFIG_TOUCHSCREEN_PIXCIR=m
+# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set
 CONFIG_TOUCHSCREEN_WM97XX=m
 CONFIG_TOUCHSCREEN_WM9705=y
 CONFIG_TOUCHSCREEN_WM9712=y
@@ -3001,6 +3039,7 @@ CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
 CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
 CONFIG_INPUT_SOC_BUTTON_ARRAY=m
 CONFIG_INPUT_DRV260X_HAPTICS=m
+# CONFIG_INPUT_DRV2665_HAPTICS is not set
 # CONFIG_INPUT_DRV2667_HAPTICS is not set
 
 #
@@ -3083,7 +3122,9 @@ CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_JSM=m
 CONFIG_SERIAL_SCCNXP=m
+CONFIG_SERIAL_SC16IS7XX_CORE=m
 CONFIG_SERIAL_SC16IS7XX=m
+CONFIG_SERIAL_SC16IS7XX_I2C=y
 CONFIG_SERIAL_ALTERA_JTAGUART=m
 CONFIG_SERIAL_ALTERA_UART=m
 CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
@@ -3372,9 +3413,12 @@ CONFIG_POWER_SUPPLY=y
 CONFIG_CHARGER_GPIO=m
 CONFIG_CHARGER_BQ2415X=m
 CONFIG_CHARGER_BQ24190=m
+# CONFIG_CHARGER_BQ24257 is not set
 CONFIG_CHARGER_BQ24735=m
+# CONFIG_CHARGER_BQ25890 is not set
 CONFIG_CHARGER_SMB347=m
 CONFIG_BATTERY_GAUGE_LTC2941=m
+# CONFIG_CHARGER_RT9455 is not set
 # CONFIG_POWER_RESET is not set
 CONFIG_POWER_AVS=y
 CONFIG_HWMON=y
@@ -3409,6 +3453,7 @@ CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_ATXP1=m
 CONFIG_SENSORS_DS620=m
 CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_DELL_SMM=m
 CONFIG_SENSORS_I5K_AMB=m
 CONFIG_SENSORS_F71805F=m
 CONFIG_SENSORS_F71882FG=m
@@ -3501,6 +3546,7 @@ CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_AMC6821=m
 CONFIG_SENSORS_INA209=m
 CONFIG_SENSORS_INA2XX=m
+# CONFIG_SENSORS_TC74 is not set
 CONFIG_SENSORS_THMC50=m
 CONFIG_SENSORS_TMP102=m
 CONFIG_SENSORS_TMP103=m
@@ -3528,16 +3574,20 @@ CONFIG_SENSORS_ACPI_POWER=m
 CONFIG_SENSORS_ATK0110=m
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
+# CONFIG_THERMAL_WRITABLE_TRIPS is not set
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
 # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
 CONFIG_THERMAL_GOV_FAIR_SHARE=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_GOV_BANG_BANG=y
 CONFIG_THERMAL_GOV_USER_SPACE=y
+# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
 # CONFIG_THERMAL_EMULATION is not set
 # CONFIG_INTEL_POWERCLAMP is not set
 CONFIG_X86_PKG_TEMP_THERMAL=m
+CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
 CONFIG_INTEL_SOC_DTS_THERMAL=m
 # CONFIG_INT340X_THERMAL is not set
 
@@ -3555,6 +3605,7 @@ CONFIG_SOFT_WATCHDOG=m
 # CONFIG_XILINX_WATCHDOG is not set
 CONFIG_CADENCE_WATCHDOG=m
 CONFIG_DW_WATCHDOG=m
+# CONFIG_MAX63XX_WATCHDOG is not set
 CONFIG_RETU_WATCHDOG=m
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_ADVANTECH_WDT is not set
@@ -3700,6 +3751,7 @@ CONFIG_VIDEO_V4L2=m
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_TUNER=m
 CONFIG_V4L2_MEM2MEM_DEV=m
+# CONFIG_V4L2_FLASH_LED_CLASS is not set
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_VMALLOC=m
@@ -3934,6 +3986,7 @@ CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_SOLO6X10=m
 # CONFIG_VIDEO_TW68 is not set
+# CONFIG_VIDEO_DT3155 is not set
 
 #
 # Media capture/analog/hybrid TV support
@@ -4195,6 +4248,7 @@ CONFIG_DVB_TDA826X=m
 CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
@@ -4329,6 +4383,7 @@ CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RADEON_UMS is not set
+# CONFIG_DRM_AMDGPU is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
@@ -4355,6 +4410,7 @@ CONFIG_DRM_MGAG200=m
 CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_QXL=m
 CONFIG_DRM_BOCHS=m
+# CONFIG_DRM_VIRTIO_GPU is not set
 CONFIG_DRM_PANEL=y
 
 #
@@ -4492,11 +4548,11 @@ CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
 CONFIG_SND_DYNAMIC_MINORS=y
 CONFIG_SND_MAX_CARDS=32
 # CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_PROC_FS=y
 CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
 CONFIG_SND_VMASTER=y
-CONFIG_SND_KCTL_JACK=y
 CONFIG_SND_DMA_SGBUF=y
 CONFIG_SND_RAWMIDI_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
@@ -4598,20 +4654,16 @@ CONFIG_SND_YMFPCI=m
 #
 CONFIG_SND_HDA=m
 CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_DSP_LOADER=y
-CONFIG_SND_HDA_PREALLOC_SIZE=4096
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDA_INPUT_BEEP=y
 CONFIG_SND_HDA_INPUT_BEEP_MODE=0
-CONFIG_SND_HDA_INPUT_JACK=y
 CONFIG_SND_HDA_PATCH_LOADER=y
 CONFIG_SND_HDA_CODEC_REALTEK=m
 CONFIG_SND_HDA_CODEC_ANALOG=m
 CONFIG_SND_HDA_CODEC_SIGMATEL=m
 CONFIG_SND_HDA_CODEC_VIA=m
 CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_I915=y
 CONFIG_SND_HDA_CODEC_CIRRUS=m
 CONFIG_SND_HDA_CODEC_CONEXANT=m
 CONFIG_SND_HDA_CODEC_CA0110=m
@@ -4622,6 +4674,9 @@ CONFIG_SND_HDA_CODEC_SI3054=m
 CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
 CONFIG_SND_HDA_CORE=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_I915=y
+CONFIG_SND_HDA_PREALLOC_SIZE=4096
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_USB_UA101=m
@@ -4774,6 +4829,7 @@ CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_OTG_FSM=m
+# CONFIG_USB_ULPI_BUS is not set
 CONFIG_USB_MON=y
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
@@ -4875,7 +4931,6 @@ CONFIG_USB_DWC2_HOST=y
 #
 # Gadget/Dual-role mode requires USB Gadget support to be enabled
 #
-CONFIG_USB_DWC2_PLATFORM=y
 CONFIG_USB_DWC2_PCI=y
 # CONFIG_USB_DWC2_DEBUG is not set
 # CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
@@ -5024,6 +5079,7 @@ CONFIG_MMC_USDHI6ROL0=m
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 # CONFIG_MMC_TOSHIBA_PCI is not set
+# CONFIG_MMC_MTK is not set
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set
 
@@ -5070,6 +5126,7 @@ CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_DELL_NETBOOKS=m
 CONFIG_LEDS_TCA6507=m
+# CONFIG_LEDS_TLC591XX is not set
 CONFIG_LEDS_LM355x=m
 
 #
@@ -5114,7 +5171,6 @@ CONFIG_INFINIBAND_CXGB3=m
 # CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 CONFIG_INFINIBAND_CXGB4=m
 CONFIG_MLX4_INFINIBAND=m
-# CONFIG_MLX5_INFINIBAND is not set
 CONFIG_INFINIBAND_NES=m
 # CONFIG_INFINIBAND_NES_DEBUG is not set
 # CONFIG_INFINIBAND_OCRDMA is not set
@@ -5127,6 +5183,8 @@ CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_ISERT=m
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
 CONFIG_EDAC=y
 CONFIG_EDAC_LEGACY_SYSFS=y
 # CONFIG_EDAC_DEBUG is not set
@@ -5150,8 +5208,9 @@ CONFIG_EDAC_SBRIDGE=m
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_SYSTOHC=y
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 # CONFIG_RTC_DEBUG is not set
 
 #
@@ -5227,7 +5286,7 @@ CONFIG_RTC_DRV_V3020=m
 #
 # on-CPU RTC drivers
 #
-CONFIG_RTC_DRV_XGENE=m
+# CONFIG_RTC_DRV_MT6397 is not set
 
 #
 # HID Sensor RTC drivers
@@ -5270,6 +5329,7 @@ CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UIO_NETX is not set
+# CONFIG_UIO_PRUSS is not set
 # CONFIG_UIO_MF624 is not set
 CONFIG_VFIO_IOMMU_TYPE1=y
 CONFIG_VFIO_VIRQFD=y
@@ -5353,7 +5413,6 @@ CONFIG_FB_SM750=m
 CONFIG_STAGING_MEDIA=y
 CONFIG_I2C_BCM2048=m
 # CONFIG_DVB_CXD2099 is not set
-# CONFIG_VIDEO_DT3155 is not set
 # CONFIG_DVB_MN88472 is not set
 # CONFIG_DVB_MN88473 is not set
 CONFIG_LIRC_STAGING=y
@@ -5395,13 +5454,7 @@ CONFIG_DGAP=m
 # CONFIG_GS_FPGABOOT is not set
 # CONFIG_CRYPTO_SKEIN is not set
 CONFIG_UNISYSSPAR=y
-CONFIG_UNISYS_VISORUTIL=m
-CONFIG_UNISYS_VISORCHANNEL=m
-CONFIG_UNISYS_VISORCHIPSET=m
-CONFIG_UNISYS_UISLIB=m
-CONFIG_UNISYS_VIRTPCI=m
-CONFIG_UNISYS_VIRTHBA=m
-# CONFIG_I2O is not set
+# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -5411,6 +5464,7 @@ CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_AIO=m
 CONFIG_DELL_SMO8800=m
+# CONFIG_DELL_RBTN is not set
 CONFIG_FUJITSU_LAPTOP=m
 # CONFIG_FUJITSU_LAPTOP_DEBUG is not set
 CONFIG_FUJITSU_TABLET=m
@@ -5455,11 +5509,13 @@ CONFIG_INTEL_RST=m
 # CONFIG_INTEL_SMARTCONNECT is not set
 CONFIG_SHUTTLE_WMI=m
 CONFIG_PVPANIC=m
+# CONFIG_INTEL_PMC_IPC is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_CHROMEOS_PSTORE=m
 CONFIG_CROS_EC_CHARDEV=m
 CONFIG_CROS_EC_LPC=m
+CONFIG_CROS_EC_PROTO=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -5519,6 +5575,7 @@ CONFIG_STE_MODEM_RPROC=m
 #
 # SOC (System On Chip) specific Drivers
 #
+# CONFIG_SUNXI_SRAM is not set
 # CONFIG_SOC_TI is not set
 CONFIG_PM_DEVFREQ=y
 
@@ -5538,6 +5595,10 @@ CONFIG_PM_DEVFREQ_EVENT=y
 # CONFIG_MEMORY is not set
 # CONFIG_IIO is not set
 CONFIG_NTB=m
+# CONFIG_NTB_INTEL is not set
+# CONFIG_NTB_PINGPONG is not set
+# CONFIG_NTB_TOOL is not set
+# CONFIG_NTB_TRANSPORT is not set
 # CONFIG_VME_BUS is not set
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
@@ -5553,6 +5614,8 @@ CONFIG_RESET_CONTROLLER=y
 # PHY Subsystem
 #
 CONFIG_GENERIC_PHY=y
+# CONFIG_PHY_PXA_28NM_HSIC is not set
+# CONFIG_PHY_PXA_28NM_USB2 is not set
 CONFIG_BCM_KONA_USB2_PHY=m
 CONFIG_PHY_SAMSUNG_USB2=m
 # CONFIG_PHY_EXYNOS4210_USB2 is not set
@@ -5569,6 +5632,7 @@ CONFIG_THUNDERBOLT=m
 #
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
+# CONFIG_LIBNVDIMM is not set
 
 #
 # Firmware Drivers
@@ -5595,6 +5659,7 @@ CONFIG_GOOGLE_SMI=m
 # EFI (Extensible Firmware Interface) Support
 #
 CONFIG_EFI_VARS=y
+CONFIG_EFI_ESRT=y
 CONFIG_EFI_VARS_PSTORE=y
 # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
 CONFIG_EFI_RUNTIME_MAP=y
@@ -5663,6 +5728,7 @@ CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
 # CONFIG_F2FS_FS_SECURITY is not set
 # CONFIG_F2FS_CHECK_FS is not set
+# CONFIG_F2FS_FS_ENCRYPTION is not set
 CONFIG_F2FS_IO_TRACE=y
 CONFIG_FS_DAX=y
 CONFIG_FS_POSIX_ACL=y
@@ -5726,6 +5792,7 @@ CONFIG_PROC_KCORE=y
 CONFIG_PROC_VMCORE=y
 CONFIG_PROC_SYSCTL=y
 CONFIG_PROC_PAGE_MONITOR=y
+# CONFIG_PROC_CHILDREN is not set
 CONFIG_KERNFS=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
@@ -5848,8 +5915,7 @@ CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_SUNRPC_DEBUG=y
-CONFIG_SUNRPC_XPRT_RDMA_CLIENT=m
-CONFIG_SUNRPC_XPRT_RDMA_SERVER=m
+CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
 # CONFIG_CEPH_FSCACHE is not set
 CONFIG_CEPH_FS_POSIX_ACL=y
@@ -5972,7 +6038,6 @@ CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 CONFIG_HAVE_ARCH_KMEMCHECK=y
 CONFIG_HAVE_ARCH_KASAN=y
-CONFIG_KASAN_SHADOW_OFFSET=0xdffffc0000000000
 
 #
 # Debug Lockups and Hangs
@@ -5980,6 +6045,7 @@ CONFIG_KASAN_SHADOW_OFFSET=0xdffffc0000000000
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
+CONFIG_SCHED_INFO=y
 CONFIG_DEBUG_TIMEKEEPING=y
 
 #
@@ -6083,6 +6149,7 @@ CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_NONE is not set
 CONFIG_DEFAULT_IO_DELAY_TYPE=0
 CONFIG_OPTIMIZE_INLINING=y
+# CONFIG_PUNIT_ATOM_DEBUG is not set
 
 #
 # Security options
@@ -6141,14 +6208,17 @@ CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_PCOMP=m
 CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_AKCIPHER2=y
+# CONFIG_CRYPTO_RSA is not set
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
 CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=y
@@ -6163,7 +6233,9 @@ CONFIG_CRYPTO_GLUE_HELPER_X86=m
 #
 CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_GCM=m
+# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
 CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_ECHAINIV=m
 
 #
 # Block modes
@@ -6194,6 +6266,7 @@ CONFIG_CRYPTO_CRC32_PCLMUL=m
 CONFIG_CRYPTO_CRCT10DIF=y
 # CONFIG_CRYPTO_CRCT10DIF_PCLMUL is not set
 CONFIG_CRYPTO_GHASH=m
+# CONFIG_CRYPTO_POLY1305 is not set
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
@@ -6238,6 +6311,7 @@ CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_SALSA20=m
 CONFIG_CRYPTO_SALSA20_X86_64=m
+# CONFIG_CRYPTO_CHACHA20 is not set
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
@@ -6256,6 +6330,7 @@ CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_ZLIB=m
 CONFIG_CRYPTO_LZO=y
+# CONFIG_CRYPTO_842 is not set
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 
@@ -6263,15 +6338,17 @@ CONFIG_CRYPTO_LZ4HC=m
 # Random Number Generation
 #
 CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_MENU=m
+CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_DRBG_HMAC=y
 # CONFIG_CRYPTO_DRBG_HASH is not set
 # CONFIG_CRYPTO_DRBG_CTR is not set
-CONFIG_CRYPTO_DRBG=m
+CONFIG_CRYPTO_DRBG=y
+CONFIG_CRYPTO_JITTERENTROPY=y
 CONFIG_CRYPTO_USER_API=y
 CONFIG_CRYPTO_USER_API_HASH=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_CRYPTO_USER_API_RNG=m
+# CONFIG_CRYPTO_USER_API_AEAD is not set
 CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
@@ -6396,6 +6473,7 @@ CONFIG_FONT_SUPPORT=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
+CONFIG_ARCH_HAS_PMEM_API=y
 
 #
 # Unofficial 3rd party kernel additions

kernel/kernel/files/patches/mageia/3rd-3rdparty-merge.patch

@@ -15,66 +15,66 @@ Signed-off-by: Thomas Backlund <tmb@mageia.org>
  arch/powerpc/Kconfig     |    2 ++
  arch/sparc/Kconfig       |    2 ++
  arch/x86/Kconfig         |    2 ++
- scripts/kconfig/Makefile |   31 +++++++++++++++++--------------
- 8 files changed, 29 insertions(+), 15 deletions(-)
+ scripts/kconfig/Makefile |   33 ++++++++++++++++++---------------
+ 8 files changed, 30 insertions(+), 16 deletions(-)
 
-diff -Nurp linux-4.1/arch/alpha/Kconfig linux-4.1-3rd/arch/alpha/Kconfig
---- linux-4.1/arch/alpha/Kconfig	2015-06-22 07:05:43.000000000 +0200
-+++ linux-4.1-3rd/arch/alpha/Kconfig	2015-06-25 20:44:03.221647317 +0200
+diff -Nurp linux-4.2.2/arch/alpha/Kconfig linux-4.2.2-3rd/arch/alpha/Kconfig
+--- linux-4.2.2/arch/alpha/Kconfig	2015-08-30 21:34:09.000000000 +0300
++++ linux-4.2.2-3rd/arch/alpha/Kconfig	2015-09-29 23:02:44.024347272 +0300
 @@ -750,3 +750,4 @@ source "crypto/Kconfig"
  
  source "lib/Kconfig"
  
 +source "3rdparty/Kconfig"
-diff -Nurp linux-4.1/arch/ia64/Kconfig linux-4.1-3rd/arch/ia64/Kconfig
---- linux-4.1/arch/ia64/Kconfig	2015-06-22 07:05:43.000000000 +0200
-+++ linux-4.1-3rd/arch/ia64/Kconfig	2015-06-25 20:44:03.231647227 +0200
-@@ -636,3 +636,5 @@ source "lib/Kconfig"
+diff -Nurp linux-4.2.2/arch/ia64/Kconfig linux-4.2.2-3rd/arch/ia64/Kconfig
+--- linux-4.2.2/arch/ia64/Kconfig	2015-08-30 21:34:09.000000000 +0300
++++ linux-4.2.2-3rd/arch/ia64/Kconfig	2015-09-29 23:02:44.024347272 +0300
+@@ -613,3 +613,5 @@ source "lib/Kconfig"
  
  config IOMMU_HELPER
  	def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB)
 +
 +source "3rdparty/Kconfig"
-diff -Nurp linux-4.1/arch/mips/Kconfig linux-4.1-3rd/arch/mips/Kconfig
---- linux-4.1/arch/mips/Kconfig	2015-06-22 07:05:43.000000000 +0200
-+++ linux-4.1-3rd/arch/mips/Kconfig	2015-06-25 20:44:03.231647227 +0200
-@@ -2893,3 +2893,5 @@ source "crypto/Kconfig"
+diff -Nurp linux-4.2.2/arch/mips/Kconfig linux-4.2.2-3rd/arch/mips/Kconfig
+--- linux-4.2.2/arch/mips/Kconfig	2015-08-30 21:34:09.000000000 +0300
++++ linux-4.2.2-3rd/arch/mips/Kconfig	2015-09-29 23:02:44.024347272 +0300
+@@ -2944,3 +2944,5 @@ source "crypto/Kconfig"
  source "lib/Kconfig"
  
  source "arch/mips/kvm/Kconfig"
 +
 +source "3rdparty/Kconfig"
-diff -Nurp linux-4.1/arch/powerpc/Kconfig linux-4.1-3rd/arch/powerpc/Kconfig
---- linux-4.1/arch/powerpc/Kconfig	2015-06-22 07:05:43.000000000 +0200
-+++ linux-4.1-3rd/arch/powerpc/Kconfig	2015-06-25 20:44:03.231647227 +0200
-@@ -1090,3 +1090,5 @@ config PPC_LIB_RHEAP
+diff -Nurp linux-4.2.2/arch/powerpc/Kconfig linux-4.2.2-3rd/arch/powerpc/Kconfig
+--- linux-4.2.2/arch/powerpc/Kconfig	2015-08-30 21:34:09.000000000 +0300
++++ linux-4.2.2-3rd/arch/powerpc/Kconfig	2015-09-29 23:02:44.025347276 +0300
+@@ -1092,3 +1092,5 @@ config PPC_LIB_RHEAP
  	bool
  
  source "arch/powerpc/kvm/Kconfig"
 +
 +source "3rdparty/Kconfig"
-diff -Nurp linux-4.1/arch/sparc/Kconfig linux-4.1-3rd/arch/sparc/Kconfig
---- linux-4.1/arch/sparc/Kconfig	2015-06-22 07:05:43.000000000 +0200
-+++ linux-4.1-3rd/arch/sparc/Kconfig	2015-06-25 20:44:03.231647227 +0200
+diff -Nurp linux-4.2.2/arch/sparc/Kconfig linux-4.2.2-3rd/arch/sparc/Kconfig
+--- linux-4.2.2/arch/sparc/Kconfig	2015-08-30 21:34:09.000000000 +0300
++++ linux-4.2.2-3rd/arch/sparc/Kconfig	2015-09-29 23:02:44.025347276 +0300
 @@ -569,3 +569,5 @@ source "security/Kconfig"
  source "crypto/Kconfig"
  
  source "lib/Kconfig"
 +
 +source "3rdparty/Kconfig"
-diff -Nurp linux-4.1/arch/x86/Kconfig linux-4.1-3rd/arch/x86/Kconfig
---- linux-4.1/arch/x86/Kconfig	2015-06-22 07:05:43.000000000 +0200
-+++ linux-4.1-3rd/arch/x86/Kconfig	2015-06-25 20:44:03.231647227 +0200
-@@ -2594,3 +2594,5 @@ source "crypto/Kconfig"
+diff -Nurp linux-4.2.2/arch/x86/Kconfig linux-4.2.2-3rd/arch/x86/Kconfig
+--- linux-4.2.2/arch/x86/Kconfig	2015-08-30 21:34:09.000000000 +0300
++++ linux-4.2.2-3rd/arch/x86/Kconfig	2015-09-29 23:02:44.025347276 +0300
+@@ -2601,3 +2601,5 @@ source "crypto/Kconfig"
  source "arch/x86/kvm/Kconfig"
  
  source "lib/Kconfig"
 +
 +source "3rdparty/Kconfig"
-diff -Nurp linux-4.1/Makefile linux-4.1-3rd/Makefile
---- linux-4.1/Makefile	2015-06-22 07:05:43.000000000 +0200
-+++ linux-4.1-3rd/Makefile	2015-06-25 20:44:03.231647227 +0200
-@@ -556,7 +556,7 @@ scripts: scripts_basic include/config/au
+diff -Nurp linux-4.2.2/Makefile linux-4.2.2-3rd/Makefile
+--- linux-4.2.2/Makefile	2015-09-29 22:13:44.743650710 +0300
++++ linux-4.2.2-3rd/Makefile	2015-09-29 23:02:44.026347280 +0300
+@@ -546,7 +546,7 @@ scripts: scripts_basic include/config/au
  
  # Objects we will link into vmlinux / subdirs we need to visit
  init-y		:= init/
@@ -83,9 +83,9 @@ diff -Nurp linux-4.1/Makefile linux-4.1-3rd/Makefile
  net-y		:= net/
  libs-y		:= lib/
  core-y		:= usr/
-diff -Nurp linux-4.1/scripts/kconfig/Makefile linux-4.1-3rd/scripts/kconfig/Makefile
---- linux-4.1/scripts/kconfig/Makefile	2015-06-22 07:05:43.000000000 +0200
-+++ linux-4.1-3rd/scripts/kconfig/Makefile	2015-06-25 20:47:50.109596717 +0200
+diff -Nurp linux-4.2.2/scripts/kconfig/Makefile linux-4.2.2-3rd/scripts/kconfig/Makefile
+--- linux-4.2.2/scripts/kconfig/Makefile	2015-08-30 21:34:09.000000000 +0300
++++ linux-4.2.2-3rd/scripts/kconfig/Makefile	2015-09-29 23:04:06.298700940 +0300
 @@ -18,26 +18,26 @@ endif
  # We need this, in case the user has it in its environment
  unexport CONFIG_
@@ -131,7 +131,7 @@ diff -Nurp linux-4.1/scripts/kconfig/Makefile linux-4.1-3rd/scripts/kconfig/Make
  PHONY += oldnoconfig savedefconfig defconfig
 @@ -88,12 +88,12 @@ PHONY += oldnoconfig savedefconfig defco
  # 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
+ # on its behavior (sets new symbols to their default value but not 'n') with the
  # counter-intuitive name.
 -oldnoconfig: olddefconfig
 +oldnoconfig: olddefconfig 3rdparty/Makefile
@@ -154,7 +154,7 @@ diff -Nurp linux-4.1/scripts/kconfig/Makefile linux-4.1-3rd/scripts/kconfig/Make
  	$(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
  
  configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@)
-@@ -112,12 +112,12 @@ configfiles=$(wildcard $(srctree)/kernel
+@@ -112,14 +112,14 @@ configfiles=$(wildcard $(srctree)/kernel
  	+$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig
  
  PHONY += kvmconfig
@@ -162,14 +162,17 @@ diff -Nurp linux-4.1/scripts/kconfig/Makefile linux-4.1-3rd/scripts/kconfig/Make
 +kvmconfig: kvm_guest.config 3rdparty/Makefile
  	@:
  
- PHONY += tinyconfig
- tinyconfig:
--	$(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config
-+	$(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config 3rdparty/Makefile
+ PHONY += xenconfig
+-xenconfig: xen.config
++xenconfig: xen.config 3rdparty/Makefile
+ 	@:
  
- # Help text used by make help
- help:
-@@ -176,6 +176,9 @@ gconf-objs	:= gconf.o zconf.tab.o
+-PHONY += tinyconfig
++PHONY += tinyconfig 3rdparty/Makefile
+ tinyconfig:
+ 	$(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config
+ 
+@@ -183,6 +183,9 @@ gconf-objs	:= gconf.o zconf.tab.o
  
  hostprogs-y := conf nconf mconf kxgettext qconf gconf
  

kernel/kernel/files/patches/mageia/3rd-ndiswrapper-4.2-buildfix.patch

@@ -0,0 +1,30 @@
+--- linux/3rdparty/ndiswrapper/loader.c.orig	2015-09-30 00:51:13.000000000 +0300
++++ linux/3rdparty/ndiswrapper/loader.c	2015-09-30 01:27:16.209213900 +0300
+@@ -21,6 +21,7 @@
+ #include <linux/module.h>
+ #include <linux/kmod.h>
+ #include <linux/miscdevice.h>
++#include <linux/vmalloc.h>
+ #include <asm/uaccess.h>
+ 
+ /*
+--- linux/3rdparty/ndiswrapper/ntoskernel.c.orig	2015-09-30 00:51:13.000000000 +0300
++++ linux/3rdparty/ndiswrapper/ntoskernel.c	2015-09-30 01:29:08.011792825 +0300
+@@ -13,6 +13,7 @@
+  *
+  */
+ 
++#include <linux/vmalloc.h>
+ #include "ntoskernel.h"
+ #include "ndis.h"
+ #include "usb.h"
+--- linux/3rdparty/ndiswrapper/pe_linker.c.orig	2015-09-30 00:51:13.000000000 +0300
++++ linux/3rdparty/ndiswrapper/pe_linker.c	2015-09-30 01:30:49.965320953 +0300
+@@ -19,6 +19,7 @@
+ 
+ #else
+ 
++#include <linux/vmalloc.h>
+ #include <linux/types.h>
+ #include <asm/errno.h>
+ 

kernel/kernel/files/patches/mageia/3rd-rtl8723bs-4.2-buildfix.patch

@@ -0,0 +1,138 @@
+From:
+https://github.com/lwfinger/rtl8723bs/commit/49fcb39bc7dc0b7ae61463d493c0b630dc6a27ca
+
+From 49fcb39bc7dc0b7ae61463d493c0b630dc6a27ca Mon Sep 17 00:00:00 2001
+From: Larry Finger <Larry.Finger@lwfinger.net>
+Date: Sat, 15 Aug 2015 10:51:20 -0500
+Subject: [PATCH] rtl8723bs: Fix builds on kernel 4.2
+
+Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
+[adapted to mga kernel / tmb]
+Signed-off-by: Thomas Backlund <tmb@mageia.org>
+---
+ hal/hal_com_phycfg.c    | 38 +++++++++++++++++++-------------------
+ os_dep/ioctl_cfg80211.c |  5 +++++
+ 2 files changed, 24 insertions(+), 19 deletions(-)
+
+ 3rdparty/rtl8723bs/hal/hal_com_phycfg.c    |   38 ++++++++++++++---------------
+ 3rdparty/rtl8723bs/os_dep/ioctl_cfg80211.c |    5 +++
+ 2 files changed, 24 insertions(+), 19 deletions(-)
+
+diff -Nurp linux/3rdparty/rtl8723bs.orig/hal/hal_com_phycfg.c linux/3rdparty/rtl8723bs/hal/hal_com_phycfg.c
+--- linux/3rdparty/rtl8723bs.orig/hal/hal_com_phycfg.c	2015-09-30 00:51:13.000000000 +0300
++++ linux/3rdparty/rtl8723bs/hal/hal_com_phycfg.c	2015-09-30 01:49:37.475440016 +0300
+@@ -2254,7 +2254,7 @@ Hal_ChannelPlanToRegulation(
+ #ifdef CONFIG_LOAD_PHY_PARA_FROM_FILE
+ 
+ extern char *rtw_phy_file_path;
+-static char	file_path[PATH_MAX];
++static char	rtl_file_path[PATH_MAX];
+ 
+ #define GetLineFromBuffer(buffer)	 strsep(&buffer, "\n")
+ 
+@@ -2276,11 +2276,11 @@ phy_ConfigMACWithParaFile(
+ 
+ 	if ((pHalData->mac_reg_len == 0) && (pHalData->mac_reg == NULL))
+ 	{
+-		rtw_merge_string(file_path, PATH_MAX, rtw_phy_file_path, pFileName);
++		rtw_merge_string(rtl_file_path, PATH_MAX, rtw_phy_file_path, pFileName);
+ 	
+-		if (rtw_is_file_readable(file_path) == true)
++		if (rtw_is_file_readable(rtl_file_path) == true)
+ 		{
+-			rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
++			rlen = rtw_retrive_from_file(rtl_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
+ 			if (rlen > 0)
+ 			{
+ 				rtStatus = _SUCCESS;
+@@ -2375,11 +2375,11 @@ phy_ConfigBBWithParaFile(
+ 
+ 	if ((pBufLen != NULL) && (*pBufLen == 0) && (pBuf == NULL))
+ 	{
+-		rtw_merge_string(file_path, PATH_MAX, rtw_phy_file_path, pFileName);
++		rtw_merge_string(rtl_file_path, PATH_MAX, rtw_phy_file_path, pFileName);
+ 	
+-		if (rtw_is_file_readable(file_path) == true)
++		if (rtw_is_file_readable(rtl_file_path) == true)
+ 		{
+-			rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
++			rlen = rtw_retrive_from_file(rtl_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
+ 			if (rlen > 0)
+ 			{
+ 				rtStatus = _SUCCESS;
+@@ -2824,11 +2824,11 @@ phy_ConfigBBWithPgParaFile(
+ 
+ 	if ((pHalData->bb_phy_reg_pg_len == 0) && (pHalData->bb_phy_reg_pg == NULL))
+ 	{
+-		rtw_merge_string(file_path, PATH_MAX, rtw_phy_file_path, pFileName);
++		rtw_merge_string(rtl_file_path, PATH_MAX, rtw_phy_file_path, pFileName);
+ 	
+-		if (rtw_is_file_readable(file_path) == true)
++		if (rtw_is_file_readable(rtl_file_path) == true)
+ 		{
+-			rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
++			rlen = rtw_retrive_from_file(rtl_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
+ 			if (rlen > 0)
+ 			{
+ 				rtStatus = _SUCCESS;
+@@ -2904,11 +2904,11 @@ PHY_ConfigRFWithParaFile(
+ 
+ 	if ((pBufLen != NULL) && (*pBufLen == 0) && (pBuf == NULL))
+ 	{
+-		rtw_merge_string(file_path, PATH_MAX, rtw_phy_file_path, pFileName);
++		rtw_merge_string(rtl_file_path, PATH_MAX, rtw_phy_file_path, pFileName);
+ 
+-		if (rtw_is_file_readable(file_path) == true)
++		if (rtw_is_file_readable(rtl_file_path) == true)
+ 		{
+-			rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
++			rlen = rtw_retrive_from_file(rtl_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
+ 			if (rlen > 0)
+ 			{
+ 				rtStatus = _SUCCESS;
+@@ -3178,11 +3178,11 @@ PHY_ConfigRFWithTxPwrTrackParaFile(
+ 
+ 	if ((pHalData->rf_tx_pwr_track_len == 0) && (pHalData->rf_tx_pwr_track == NULL))
+ 	{
+-		rtw_merge_string(file_path, PATH_MAX, rtw_phy_file_path, pFileName);
++		rtw_merge_string(rtl_file_path, PATH_MAX, rtw_phy_file_path, pFileName);
+ 	
+-		if (rtw_is_file_readable(file_path) == true)
++		if (rtw_is_file_readable(rtl_file_path) == true)
+ 		{
+-			rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
++			rlen = rtw_retrive_from_file(rtl_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
+ 			if (rlen > 0)
+ 			{
+ 				rtStatus = _SUCCESS;
+@@ -3527,11 +3527,11 @@ PHY_ConfigRFWithPowerLimitTableParaFile(
+ 
+ 	if ((pHalData->rf_tx_pwr_lmt_len == 0) && (pHalData->rf_tx_pwr_lmt == NULL))
+ 	{
+-		rtw_merge_string(file_path, PATH_MAX, rtw_phy_file_path, pFileName);
++		rtw_merge_string(rtl_file_path, PATH_MAX, rtw_phy_file_path, pFileName);
+ 	
+-		if (rtw_is_file_readable(file_path) == true)
++		if (rtw_is_file_readable(rtl_file_path) == true)
+ 		{
+-			rlen = rtw_retrive_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
++			rlen = rtw_retrive_from_file(rtl_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
+ 			if (rlen > 0)
+ 			{
+ 				rtStatus = _SUCCESS;
+diff -Nurp linux/3rdparty/rtl8723bs.orig/os_dep/ioctl_cfg80211.c linux/3rdparty/rtl8723bs/os_dep/ioctl_cfg80211.c
+--- linux/3rdparty/rtl8723bs.orig/os_dep/ioctl_cfg80211.c	2015-09-30 00:51:13.000000000 +0300
++++ linux/3rdparty/rtl8723bs/os_dep/ioctl_cfg80211.c	2015-09-30 01:49:37.476440020 +0300
+@@ -587,7 +587,12 @@ void rtw_cfg80211_indicate_disconnect(_a
+ 
+ 	if (!padapter->mlmepriv.not_indic_disco) {
+ 		if(check_fwstate(&padapter->mlmepriv, _FW_LINKED))		
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0))
++			cfg80211_disconnected(padapter->pnetdev, 0,
++					      NULL, 0, true, GFP_ATOMIC);
++#else
+ 			cfg80211_disconnected(padapter->pnetdev, 0, NULL, 0, GFP_ATOMIC);
++#endif
+ 		else
+ 			cfg80211_connect_result(padapter->pnetdev, NULL, NULL, 0, NULL, 0, 
+ 				WLAN_STATUS_UNSPECIFIED_FAILURE, GFP_ATOMIC/*GFP_KERNEL*/);

kernel/kernel/files/patches/mageia/ata-jmicron-disable-broken-async_suspend.patch

@@ -1,29 +0,0 @@
-
-Fix broken async_suspend
-
-https://bugzilla.kernel.org/show_bug.cgi?id=81551
-
---- a/drivers/pci/quirks.c	
-+++ a/drivers/pci/quirks.c	
-@@ -29,6 +29,21 @@
- #include "pci.h"
- 
- /*
-+ * For JMicron chips, we need to disable the async_suspend method, otherwise
-+ * they will hit the power-on issue when doing device resume, add one quick
-+ * solution to disable the async_suspend method.
-+ */
-+static void pci_async_suspend_fixup(struct pci_dev *pdev)
-+{
-+        /*
-+         * disabling the async_suspend method for JMicron chips to
-+         * avoid device resuming issue.
-+         */
-+        device_disable_async_suspend(&pdev->dev);
-+}
-+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, pci_async_suspend_fixup);
-+
-+/*
-  * Decoding should be disabled for a PCI device during BAR sizing to avoid
-  * conflict. But doing so may cause problems on host bridge and perhaps other
-  * key system devices. For devices that need to have mmio decoding always-on,

kernel/kernel/files/patches/mageia/ata-revert-Disabling-the-async-PM-for-JMicron-chip-363-361.patch

@@ -1,68 +0,0 @@
-
-This patch reverts:
-
-From e6b7e41cdd8cae0591e04d9519b65470110e2d44 Mon Sep 17 00:00:00 2001
-From: Chuansheng Liu <chuansheng.liu@intel.com>
-Date: Mon, 1 Sep 2014 08:38:03 +0800
-Subject: [PATCH] ata: Disabling the async PM for JMicron chip 363/361
-
-
-in favour of the pci quirks based patch:
-https://bugzilla.kernel.org/show_bug.cgi?id=81551
-
-Signed-off-by: Thomas Backlund <tmb@mageia.org>
-
----
- drivers/ata/ahci.c         | 12 ------------
- drivers/ata/pata_jmicron.c | 12 ------------
- 2 files changed, 24 deletions(-)
-
-diff --git b/drivers/ata/ahci.c a/drivers/ata/ahci.c
-index f7da21b..bca3d64 100644
---- b/drivers/ata/ahci.c
-+++ a/drivers/ata/ahci.c
-@@ -1337,18 +1337,6 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
- 	else if (pdev->vendor == 0x1c44 && pdev->device == 0x8000)
- 		ahci_pci_bar = AHCI_PCI_BAR_ENMOTUS;
- 
--	/*
--	 * The JMicron chip 361/363 contains one SATA controller and one
--	 * PATA controller,for powering on these both controllers, we must
--	 * follow the sequence one by one, otherwise one of them can not be
--	 * powered on successfully, so here we disable the async suspend
--	 * method for these chips.
--	 */
--	if (pdev->vendor == PCI_VENDOR_ID_JMICRON &&
--		(pdev->device == PCI_DEVICE_ID_JMICRON_JMB363 ||
--		pdev->device == PCI_DEVICE_ID_JMICRON_JMB361))
--		device_disable_async_suspend(&pdev->dev);
--
- 	/* acquire resources */
- 	rc = pcim_enable_device(pdev);
- 	if (rc)
-diff --git b/drivers/ata/pata_jmicron.c a/drivers/ata/pata_jmicron.c
-index 47e418b..4d1a5d2 100644
---- b/drivers/ata/pata_jmicron.c
-+++ a/drivers/ata/pata_jmicron.c
-@@ -143,18 +143,6 @@ static int jmicron_init_one (struct pci_dev *pdev, const struct pci_device_id *i
- 	};
- 	const struct ata_port_info *ppi[] = { &info, NULL };
- 
--	/*
--	 * The JMicron chip 361/363 contains one SATA controller and one
--	 * PATA controller,for powering on these both controllers, we must
--	 * follow the sequence one by one, otherwise one of them can not be
--	 * powered on successfully, so here we disable the async suspend
--	 * method for these chips.
--	 */
--	if (pdev->vendor == PCI_VENDOR_ID_JMICRON &&
--		(pdev->device == PCI_DEVICE_ID_JMICRON_JMB363 ||
--		pdev->device == PCI_DEVICE_ID_JMICRON_JMB361))
--		device_disable_async_suspend(&pdev->dev);
--
- 	return ata_pci_bmdma_init_one(pdev, ppi, &jmicron_sht, NULL, 0);
- }
- 
--- 
-1.8.5.6
-

kernel/kernel/files/patches/mageia/base-cacheinfo-silence-DT-warnings.patch

@@ -0,0 +1,49 @@
+
+Devicetree is enabled on 32bit kernels for OLPC support,
+but this causes error messages:
+
+'Failed to find cpu0 device node' that breaks bootsplash.
+
+https://bugs.mageia.org/show_bug.cgi?id=16655#c39
+https://bugs.mageia.org/show_bug.cgi?id=17010
+
+So hide them behind debug for cleaner boot.
+
+Signed-off-by: Thomas Backlund <tmb@mageia.org>
+
+
+--- linux/drivers/base/cacheinfo.c.orig
++++ linux/drivers/base/cacheinfo.c
+@@ -53,12 +53,12 @@
+ 		return 0;
+ 
+ 	if (!cpu_dev) {
+-		pr_err("No cpu device for CPU %d\n", cpu);
++		pr_debug("No cpu device for CPU %d\n", cpu);
+ 		return -ENODEV;
+ 	}
+ 	np = cpu_dev->of_node;
+ 	if (!np) {
+-		pr_err("Failed to find cpu%d device node\n", cpu);
++		pr_debug("Failed to find cpu%d device node\n", cpu);
+ 		return -ENOENT;
+ 	}
+ 
+@@ -203,7 +203,7 @@
+ 	 */
+ 	ret = cache_shared_cpu_map_setup(cpu);
+ 	if (ret) {
+-		pr_warn("Unable to detect cache hierarchy from DT for CPU %d\n",
++		pr_debug("Unable to detect cache hierarchy from DT for CPU %d\n",
+ 			cpu);
+ 		goto free_ci;
+ 	}
+@@ -540,7 +540,7 @@
+ 		rc = cache_add_dev(cpu);
+ 		if (rc) {
+ 			free_cache_attributes(cpu);
+-			pr_err("error populating cacheinfo..cpu%d\n", cpu);
++			pr_debug("error populating cacheinfo..cpu%d\n", cpu);
+ 			goto out;
+ 		}
+ 	}

kernel/kernel/files/patches/mageia/block-cfq-iosched-fix-the-setting-of-IOPS-mode-on-SSDs.patch

@@ -1,95 +0,0 @@
-From 0bb979472a7401022109e81dd89d777adea58710 Mon Sep 17 00:00:00 2001
-From: Jens Axboe <axboe@fb.com>
-Date: Wed, 10 Jun 2015 08:01:20 -0600
-Subject: cfq-iosched: fix the setting of IOPS mode on SSDs
-
-A previous commit wanted to make CFQ default to IOPS mode on
-non-rotational storage, however it did so when the queue was
-initialized and the non-rotational flag is only set later on
-in the probe.
-
-Add an elevator hook that gets called off the add_disk() path,
-at that point we know that feature probing has finished, and
-we can reliably check for the various flags that drivers can
-set.
-
-Fixes: 41c0126b ("block: Make CFQ default to IOPS mode on SSDs")
-Tested-by: Romain Francoise <romain@orebokech.com>
-Signed-off-by: Jens Axboe <axboe@fb.com>
-
-diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
-index c808ad8..d1d0cb2 100644
---- a/block/cfq-iosched.c
-+++ b/block/cfq-iosched.c
-@@ -4508,7 +4508,7 @@ static int cfq_init_queue(struct request_queue *q, struct elevator_type *e)
- 	cfqd->cfq_slice[1] = cfq_slice_sync;
- 	cfqd->cfq_target_latency = cfq_target_latency;
- 	cfqd->cfq_slice_async_rq = cfq_slice_async_rq;
--	cfqd->cfq_slice_idle = blk_queue_nonrot(q) ? 0 : cfq_slice_idle;
-+	cfqd->cfq_slice_idle = cfq_slice_idle;
- 	cfqd->cfq_group_idle = cfq_group_idle;
- 	cfqd->cfq_latency = 1;
- 	cfqd->hw_tag = -1;
-@@ -4525,6 +4525,18 @@ out_free:
- 	return ret;
- }
- 
-+static void cfq_registered_queue(struct request_queue *q)
-+{
-+	struct elevator_queue *e = q->elevator;
-+	struct cfq_data *cfqd = e->elevator_data;
-+
-+	/*
-+	 * Default to IOPS mode with no idling for SSDs
-+	 */
-+	if (blk_queue_nonrot(q))
-+		cfqd->cfq_slice_idle = 0;
-+}
-+
- /*
-  * sysfs parts below -->
-  */
-@@ -4640,6 +4652,7 @@ static struct elevator_type iosched_cfq = {
- 		.elevator_may_queue_fn =	cfq_may_queue,
- 		.elevator_init_fn =		cfq_init_queue,
- 		.elevator_exit_fn =		cfq_exit_queue,
-+		.elevator_registered_fn =	cfq_registered_queue,
- 	},
- 	.icq_size	=	sizeof(struct cfq_io_cq),
- 	.icq_align	=	__alignof__(struct cfq_io_cq),
-diff --git a/block/elevator.c b/block/elevator.c
-index 59794d0..5f04527 100644
---- a/block/elevator.c
-+++ b/block/elevator.c
-@@ -810,6 +810,8 @@ int elv_register_queue(struct request_queue *q)
- 		}
- 		kobject_uevent(&e->kobj, KOBJ_ADD);
- 		e->registered = 1;
-+		if (e->type->ops.elevator_registered_fn)
-+			e->type->ops.elevator_registered_fn(q);
- 	}
- 	return error;
- }
-diff --git a/include/linux/elevator.h b/include/linux/elevator.h
-index 45a9147..638b324 100644
---- a/include/linux/elevator.h
-+++ b/include/linux/elevator.h
-@@ -39,6 +39,7 @@ typedef void (elevator_deactivate_req_fn) (struct request_queue *, struct reques
- typedef int (elevator_init_fn) (struct request_queue *,
- 				struct elevator_type *e);
- typedef void (elevator_exit_fn) (struct elevator_queue *);
-+typedef void (elevator_registered_fn) (struct request_queue *);
- 
- struct elevator_ops
- {
-@@ -68,6 +69,7 @@ struct elevator_ops
- 
- 	elevator_init_fn *elevator_init_fn;
- 	elevator_exit_fn *elevator_exit_fn;
-+	elevator_registered_fn *elevator_registered_fn;
- };
- 
- #define ELV_NAME_MAX	(16)
--- 
-cgit v0.10.2
-

kernel/kernel/files/patches/mageia/fs-aufs4-modular.patch

@@ -14,9 +14,9 @@
  security/security.c      |   10 ++++++++++
  13 files changed, 36 insertions(+), 1 deletion(-)
 
-diff -Nurp linux-4.1-aufs4/fs/aufs/Kconfig linux-4.1-aufs4-mod/fs/aufs/Kconfig
---- linux-4.1-aufs4/fs/aufs/Kconfig	2015-06-25 20:09:18.250319377 +0200
-+++ linux-4.1-aufs4-mod/fs/aufs/Kconfig	2015-06-25 20:11:30.629136790 +0200
+diff -Nurp linux-4.2.2-aufs4/fs/aufs/Kconfig linux-4.2.2-aufs4-mod/fs/aufs/Kconfig
+--- linux-4.2.2-aufs4/fs/aufs/Kconfig	2015-09-29 23:28:44.631823736 +0300
++++ linux-4.2.2-aufs4-mod/fs/aufs/Kconfig	2015-09-29 23:48:32.711006787 +0300
 @@ -1,5 +1,5 @@
  config AUFS_FS
 -	bool "Aufs (Advanced multi layered unification filesystem) support"
@@ -24,10 +24,10 @@ diff -Nurp linux-4.1-aufs4/fs/aufs/Kconfig linux-4.1-aufs4-mod/fs/aufs/Kconfig
  	help
  	Aufs is a stackable unification filesystem such as Unionfs,
  	which unifies several directories and provides a merged single
-diff -Nurp linux-4.1-aufs4/fs/dcache.c linux-4.1-aufs4-mod/fs/dcache.c
---- linux-4.1-aufs4/fs/dcache.c	2015-06-25 20:09:18.280319109 +0200
-+++ linux-4.1-aufs4-mod/fs/dcache.c	2015-06-25 20:11:30.629136790 +0200
-@@ -1269,6 +1269,7 @@ rename_retry:
+diff -Nurp linux-4.2.2-aufs4/fs/dcache.c linux-4.2.2-aufs4-mod/fs/dcache.c
+--- linux-4.2.2-aufs4/fs/dcache.c	2015-09-29 23:28:44.644823810 +0300
++++ linux-4.2.2-aufs4-mod/fs/dcache.c	2015-09-29 23:48:32.711006787 +0300
+@@ -1272,6 +1272,7 @@ rename_retry:
  	seq = 1;
  	goto again;
  }
@@ -35,9 +35,9 @@ diff -Nurp linux-4.1-aufs4/fs/dcache.c linux-4.1-aufs4-mod/fs/dcache.c
  
  /*
   * Search for at least 1 mount point in the dentry's subdirs.
-diff -Nurp linux-4.1-aufs4/fs/file_table.c linux-4.1-aufs4-mod/fs/file_table.c
---- linux-4.1-aufs4/fs/file_table.c	2015-06-22 07:05:43.000000000 +0200
-+++ linux-4.1-aufs4-mod/fs/file_table.c	2015-06-25 23:47:57.011958835 +0200
+diff -Nurp linux-4.2.2-aufs4/fs/file_table.c linux-4.2.2-aufs4-mod/fs/file_table.c
+--- linux-4.2.2-aufs4/fs/file_table.c	2015-08-30 21:34:09.000000000 +0300
++++ linux-4.2.2-aufs4-mod/fs/file_table.c	2015-09-29 23:48:32.711006787 +0300
 @@ -147,6 +147,7 @@ over:
  	}
  	return ERR_PTR(-ENFILE);
@@ -52,11 +52,11 @@ diff -Nurp linux-4.1-aufs4/fs/file_table.c linux-4.1-aufs4-mod/fs/file_table.c
  }
 +EXPORT_SYMBOL(put_filp);
  
- void __init files_init(unsigned long mempages)
+ void __init files_init(void)
  { 
-diff -Nurp linux-4.1-aufs4/fs/inode.c linux-4.1-aufs4-mod/fs/inode.c
---- linux-4.1-aufs4/fs/inode.c	2015-06-22 07:05:43.000000000 +0200
-+++ linux-4.1-aufs4-mod/fs/inode.c	2015-06-25 22:45:45.000000000 +0200
+diff -Nurp linux-4.2.2-aufs4/fs/inode.c linux-4.2.2-aufs4-mod/fs/inode.c
+--- linux-4.2.2-aufs4/fs/inode.c	2015-08-30 21:34:09.000000000 +0300
++++ linux-4.2.2-aufs4-mod/fs/inode.c	2015-09-29 23:48:32.712006792 +0300
 @@ -58,6 +58,7 @@ static struct hlist_head *inode_hashtabl
  static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock);
  
@@ -65,7 +65,7 @@ diff -Nurp linux-4.1-aufs4/fs/inode.c linux-4.1-aufs4-mod/fs/inode.c
  
  /*
   * Empty aops. Can be used for the cases where the user does not
-@@ -1575,6 +1576,7 @@ static int update_time(struct inode *ino
+@@ -1581,6 +1582,7 @@ static int update_time(struct inode *ino
  
  	return update_time(inode, time, flags);
  }
@@ -73,9 +73,9 @@ diff -Nurp linux-4.1-aufs4/fs/inode.c linux-4.1-aufs4-mod/fs/inode.c
  
  /**
   *	touch_atime	-	update the access time
-diff -Nurp linux-4.1-aufs4/fs/namespace.c linux-4.1-aufs4-mod/fs/namespace.c
---- linux-4.1-aufs4/fs/namespace.c	2015-06-22 07:05:43.000000000 +0200
-+++ linux-4.1-aufs4-mod/fs/namespace.c	2015-06-25 20:11:30.629136790 +0200
+diff -Nurp linux-4.2.2-aufs4/fs/namespace.c linux-4.2.2-aufs4-mod/fs/namespace.c
+--- linux-4.2.2-aufs4/fs/namespace.c	2015-08-30 21:34:09.000000000 +0300
++++ linux-4.2.2-aufs4-mod/fs/namespace.c	2015-09-29 23:48:32.712006792 +0300
 @@ -463,6 +463,7 @@ void __mnt_drop_write(struct vfsmount *m
  	mnt_dec_writers(real_mount(mnt));
  	preempt_enable();
@@ -84,7 +84,7 @@ diff -Nurp linux-4.1-aufs4/fs/namespace.c linux-4.1-aufs4-mod/fs/namespace.c
  
  /**
   * mnt_drop_write - give up write access to a mount
-@@ -1768,6 +1769,7 @@ int iterate_mounts(int (*f)(struct vfsmo
+@@ -1803,6 +1804,7 @@ int iterate_mounts(int (*f)(struct vfsmo
  	}
  	return 0;
  }
@@ -92,9 +92,9 @@ diff -Nurp linux-4.1-aufs4/fs/namespace.c linux-4.1-aufs4-mod/fs/namespace.c
  
  static void cleanup_group_ids(struct mount *mnt, struct mount *end)
  {
-diff -Nurp linux-4.1-aufs4/fs/notify/group.c linux-4.1-aufs4-mod/fs/notify/group.c
---- linux-4.1-aufs4/fs/notify/group.c	2015-06-22 07:05:43.000000000 +0200
-+++ linux-4.1-aufs4-mod/fs/notify/group.c	2015-06-25 20:11:30.629136790 +0200
+diff -Nurp linux-4.2.2-aufs4/fs/notify/group.c linux-4.2.2-aufs4-mod/fs/notify/group.c
+--- linux-4.2.2-aufs4/fs/notify/group.c	2015-08-30 21:34:09.000000000 +0300
++++ linux-4.2.2-aufs4-mod/fs/notify/group.c	2015-09-29 23:48:32.712006792 +0300
 @@ -22,6 +22,7 @@
  #include <linux/srcu.h>
  #include <linux/rculist.h>
@@ -127,9 +127,9 @@ diff -Nurp linux-4.1-aufs4/fs/notify/group.c linux-4.1-aufs4-mod/fs/notify/group
  
  int fsnotify_fasync(int fd, struct file *file, int on)
  {
-diff -Nurp linux-4.1-aufs4/fs/notify/mark.c linux-4.1-aufs4-mod/fs/notify/mark.c
---- linux-4.1-aufs4/fs/notify/mark.c	2015-06-22 07:05:43.000000000 +0200
-+++ linux-4.1-aufs4-mod/fs/notify/mark.c	2015-06-25 20:11:30.629136790 +0200
+diff -Nurp linux-4.2.2-aufs4/fs/notify/mark.c linux-4.2.2-aufs4-mod/fs/notify/mark.c
+--- linux-4.2.2-aufs4/fs/notify/mark.c	2015-08-30 21:34:09.000000000 +0300
++++ linux-4.2.2-aufs4-mod/fs/notify/mark.c	2015-09-29 23:48:32.713006798 +0300
 @@ -109,6 +109,7 @@ void fsnotify_put_mark(struct fsnotify_m
  		mark->free_mark(mark);
  	}
@@ -154,7 +154,7 @@ diff -Nurp linux-4.1-aufs4/fs/notify/mark.c linux-4.1-aufs4-mod/fs/notify/mark.c
  
  /*
   * Given a list of marks, find the mark associated with given group. If found
-@@ -455,6 +458,7 @@ void fsnotify_init_mark(struct fsnotify_
+@@ -475,6 +478,7 @@ void fsnotify_init_mark(struct fsnotify_
  	atomic_set(&mark->refcnt, 1);
  	mark->free_mark = free_mark;
  }
@@ -162,10 +162,10 @@ diff -Nurp linux-4.1-aufs4/fs/notify/mark.c linux-4.1-aufs4-mod/fs/notify/mark.c
  
  static int fsnotify_mark_destroy(void *ignored)
  {
-diff -Nurp linux-4.1-aufs4/fs/open.c linux-4.1-aufs4-mod/fs/open.c
---- linux-4.1-aufs4/fs/open.c	2015-06-22 07:05:43.000000000 +0200
-+++ linux-4.1-aufs4-mod/fs/open.c	2015-06-25 23:49:02.741362661 +0200
-@@ -62,6 +62,7 @@ int do_truncate(struct dentry *dentry, l
+diff -Nurp linux-4.2.2-aufs4/fs/open.c linux-4.2.2-aufs4-mod/fs/open.c
+--- linux-4.2.2-aufs4/fs/open.c	2015-08-30 21:34:09.000000000 +0300
++++ linux-4.2.2-aufs4-mod/fs/open.c	2015-09-29 23:48:32.713006798 +0300
+@@ -64,6 +64,7 @@ int do_truncate(struct dentry *dentry, l
  	mutex_unlock(&dentry->d_inode->i_mutex);
  	return ret;
  }
@@ -173,17 +173,17 @@ diff -Nurp linux-4.1-aufs4/fs/open.c linux-4.1-aufs4-mod/fs/open.c
  
  long vfs_truncate(struct path *path, loff_t length)
  {
-@@ -676,6 +677,7 @@ int open_check_o_direct(struct file *f)
+@@ -678,6 +679,7 @@ int open_check_o_direct(struct file *f)
  	}
  	return 0;
  }
 +EXPORT_SYMBOL(open_check_o_direct);
  
  static int do_dentry_open(struct file *f,
- 			  int (*open)(struct inode *, struct file *),
-diff -Nurp linux-4.1-aufs4/fs/read_write.c linux-4.1-aufs4-mod/fs/read_write.c
---- linux-4.1-aufs4/fs/read_write.c	2015-06-25 20:09:18.280319109 +0200
-+++ linux-4.1-aufs4-mod/fs/read_write.c	2015-06-25 23:43:56.804138140 +0200
+ 			  struct inode *inode,
+diff -Nurp linux-4.2.2-aufs4/fs/read_write.c linux-4.2.2-aufs4-mod/fs/read_write.c
+--- linux-4.2.2-aufs4/fs/read_write.c	2015-09-29 23:28:44.645823816 +0300
++++ linux-4.2.2-aufs4-mod/fs/read_write.c	2015-09-29 23:48:32.713006798 +0300
 @@ -504,6 +504,7 @@ vfs_readf_t vfs_readf(struct file *file)
  		return new_sync_read;
  	return ERR_PTR(-ENOSYS);
@@ -200,10 +200,10 @@ diff -Nurp linux-4.1-aufs4/fs/read_write.c linux-4.1-aufs4-mod/fs/read_write.c
  
  ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t *pos)
  {
-diff -Nurp linux-4.1-aufs4/fs/splice.c linux-4.1-aufs4-mod/fs/splice.c
---- linux-4.1-aufs4/fs/splice.c	2015-06-25 20:09:18.280319109 +0200
-+++ linux-4.1-aufs4-mod/fs/splice.c	2015-06-25 20:11:30.629136790 +0200
-@@ -1114,6 +1114,7 @@ long do_splice_from(struct pipe_inode_in
+diff -Nurp linux-4.2.2-aufs4/fs/splice.c linux-4.2.2-aufs4-mod/fs/splice.c
+--- linux-4.2.2-aufs4/fs/splice.c	2015-09-29 23:28:44.646823822 +0300
++++ linux-4.2.2-aufs4-mod/fs/splice.c	2015-09-29 23:48:32.713006798 +0300
+@@ -1115,6 +1115,7 @@ long do_splice_from(struct pipe_inode_in
  
  	return splice_write(pipe, out, ppos, len, flags);
  }
@@ -211,7 +211,7 @@ diff -Nurp linux-4.1-aufs4/fs/splice.c linux-4.1-aufs4-mod/fs/splice.c
  
  /*
   * Attempt to initiate a splice from a file to a pipe.
-@@ -1140,6 +1141,7 @@ long do_splice_to(struct file *in, loff_
+@@ -1141,6 +1142,7 @@ long do_splice_to(struct file *in, loff_
  
  	return splice_read(in, ppos, pipe, len, flags);
  }
@@ -219,10 +219,10 @@ diff -Nurp linux-4.1-aufs4/fs/splice.c linux-4.1-aufs4-mod/fs/splice.c
  
  /**
   * splice_direct_to_actor - splices data directly between two non-pipes
-diff -Nurp linux-4.1-aufs4/security/commoncap.c linux-4.1-aufs4-mod/security/commoncap.c
---- linux-4.1-aufs4/security/commoncap.c	2015-06-22 07:05:43.000000000 +0200
-+++ linux-4.1-aufs4-mod/security/commoncap.c	2015-06-25 20:11:30.629136790 +0200
-@@ -975,9 +975,11 @@ int cap_mmap_addr(unsigned long addr)
+diff -Nurp linux-4.2.2-aufs4/security/commoncap.c linux-4.2.2-aufs4-mod/security/commoncap.c
+--- linux-4.2.2-aufs4/security/commoncap.c	2015-08-30 21:34:09.000000000 +0300
++++ linux-4.2.2-aufs4-mod/security/commoncap.c	2015-09-29 23:56:55.210817277 +0300
+@@ -970,12 +970,14 @@ int cap_mmap_addr(unsigned long addr)
  	}
  	return ret;
  }
@@ -234,9 +234,12 @@ diff -Nurp linux-4.1-aufs4/security/commoncap.c linux-4.1-aufs4-mod/security/com
  	return 0;
  }
 +EXPORT_SYMBOL(cap_mmap_file);
-diff -Nurp linux-4.1-aufs4/security/device_cgroup.c linux-4.1-aufs4-mod/security/device_cgroup.c
---- linux-4.1-aufs4/security/device_cgroup.c	2015-06-22 07:05:43.000000000 +0200
-+++ linux-4.1-aufs4-mod/security/device_cgroup.c	2015-06-25 20:11:30.629136790 +0200
+ 
+ #ifdef CONFIG_SECURITY
+ 
+diff -Nurp linux-4.2.2-aufs4/security/device_cgroup.c linux-4.2.2-aufs4-mod/security/device_cgroup.c
+--- linux-4.2.2-aufs4/security/device_cgroup.c	2015-08-30 21:34:09.000000000 +0300
++++ linux-4.2.2-aufs4-mod/security/device_cgroup.c	2015-09-29 23:48:32.714006803 +0300
 @@ -7,6 +7,7 @@
  #include <linux/device_cgroup.h>
  #include <linux/cgroup.h>
@@ -253,74 +256,74 @@ diff -Nurp linux-4.1-aufs4/security/device_cgroup.c linux-4.1-aufs4-mod/security
  
  int devcgroup_inode_mknod(int mode, dev_t dev)
  {
-diff -Nurp linux-4.1-aufs4/security/security.c linux-4.1-aufs4-mod/security/security.c
---- linux-4.1-aufs4/security/security.c	2015-06-22 07:05:43.000000000 +0200
-+++ linux-4.1-aufs4-mod/security/security.c	2015-06-25 20:11:30.629136790 +0200
-@@ -430,6 +430,7 @@ int security_path_rmdir(struct path *dir
+diff -Nurp linux-4.2.2-aufs4/security/security.c linux-4.2.2-aufs4-mod/security/security.c
+--- linux-4.2.2-aufs4/security/security.c	2015-08-30 21:34:09.000000000 +0300
++++ linux-4.2.2-aufs4-mod/security/security.c	2015-09-29 23:48:32.715006809 +0300
+@@ -438,6 +438,7 @@ int security_path_rmdir(struct path *dir
  		return 0;
- 	return security_ops->path_rmdir(dir, dentry);
+ 	return call_int_hook(path_rmdir, 0, dir, dentry);
  }
 +EXPORT_SYMBOL(security_path_rmdir);
  
  int security_path_unlink(struct path *dir, struct dentry *dentry)
  {
-@@ -446,6 +447,7 @@ int security_path_symlink(struct path *d
+@@ -454,6 +455,7 @@ int security_path_symlink(struct path *d
  		return 0;
- 	return security_ops->path_symlink(dir, dentry, old_name);
+ 	return call_int_hook(path_symlink, 0, dir, dentry, old_name);
  }
 +EXPORT_SYMBOL(security_path_symlink);
  
  int security_path_link(struct dentry *old_dentry, struct path *new_dir,
  		       struct dentry *new_dentry)
-@@ -454,6 +456,7 @@ int security_path_link(struct dentry *ol
+@@ -462,6 +464,7 @@ int security_path_link(struct dentry *ol
  		return 0;
- 	return security_ops->path_link(old_dentry, new_dir, new_dentry);
+ 	return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
  }
 +EXPORT_SYMBOL(security_path_link);
  
  int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
  			 struct path *new_dir, struct dentry *new_dentry,
-@@ -481,6 +484,7 @@ int security_path_truncate(struct path *
+@@ -489,6 +492,7 @@ int security_path_truncate(struct path *
  		return 0;
- 	return security_ops->path_truncate(path);
+ 	return call_int_hook(path_truncate, 0, path);
  }
 +EXPORT_SYMBOL(security_path_truncate);
  
  int security_path_chmod(struct path *path, umode_t mode)
  {
-@@ -488,6 +492,7 @@ int security_path_chmod(struct path *pat
+@@ -496,6 +500,7 @@ int security_path_chmod(struct path *pat
  		return 0;
- 	return security_ops->path_chmod(path, mode);
+ 	return call_int_hook(path_chmod, 0, path, mode);
  }
 +EXPORT_SYMBOL(security_path_chmod);
  
  int security_path_chown(struct path *path, kuid_t uid, kgid_t gid)
  {
-@@ -495,6 +500,7 @@ int security_path_chown(struct path *pat
+@@ -503,6 +508,7 @@ int security_path_chown(struct path *pat
  		return 0;
- 	return security_ops->path_chown(path, uid, gid);
+ 	return call_int_hook(path_chown, 0, path, uid, gid);
  }
 +EXPORT_SYMBOL(security_path_chown);
  
  int security_path_chroot(struct path *path)
  {
-@@ -580,6 +586,7 @@ int security_inode_readlink(struct dentr
+@@ -588,6 +594,7 @@ int security_inode_readlink(struct dentr
  		return 0;
- 	return security_ops->inode_readlink(dentry);
+ 	return call_int_hook(inode_readlink, 0, dentry);
  }
 +EXPORT_SYMBOL(security_inode_readlink);
  
- int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
- {
-@@ -594,6 +601,7 @@ int security_inode_permission(struct ino
+ int security_inode_follow_link(struct dentry *dentry, struct inode *inode,
+ 			       bool rcu)
+@@ -603,6 +610,7 @@ int security_inode_permission(struct ino
  		return 0;
- 	return security_ops->inode_permission(inode, mask);
+ 	return call_int_hook(inode_permission, 0, inode, mask);
  }
 +EXPORT_SYMBOL(security_inode_permission);
  
  int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
  {
-@@ -716,6 +724,7 @@ int security_file_permission(struct file
+@@ -741,6 +749,7 @@ int security_file_permission(struct file
  
  	return fsnotify_perm(file, mask);
  }
@@ -328,7 +331,7 @@ diff -Nurp linux-4.1-aufs4/security/security.c linux-4.1-aufs4-mod/security/secu
  
  int security_file_alloc(struct file *file)
  {
-@@ -775,6 +784,7 @@ int security_mmap_file(struct file *file
+@@ -800,6 +809,7 @@ int security_mmap_file(struct file *file
  		return ret;
  	return ima_file_mmap(file, prot);
  }

kernel/kernel/files/patches/mageia/fs-aufs4.patch

@@ -1,4 +1,3 @@
-
  Documentation/ABI/testing/debugfs-aufs             |   50 +
  Documentation/ABI/testing/sysfs-aufs               |   31 +
  Documentation/filesystems/aufs/README              |  383 ++++
@@ -48,7 +47,7 @@
  fs/aufs/hfsnotify.c                                |  275 +++
  fs/aufs/hfsplus.c                                  |   43 +
  fs/aufs/hnotify.c                                  |  697 ++++++++
- fs/aufs/i_op.c                                     | 1434 +++++++++++++++
+ fs/aufs/i_op.c                                     | 1470 ++++++++++++++++
  fs/aufs/i_op_add.c                                 |  919 ++++++++++
  fs/aufs/i_op_del.c                                 |  497 ++++++
  fs/aufs/i_op_ren.c                                 | 1004 +++++++++++
@@ -59,7 +58,7 @@
  fs/aufs/loop.c                                     |  132 ++
  fs/aufs/loop.h                                     |   39 +
  fs/aufs/magic.mk                                   |   30 +
- fs/aufs/module.c                                   |  196 +++
+ fs/aufs/module.c                                   |  204 +++
  fs/aufs/module.h                                   |   91 +
  fs/aufs/mvdown.c                                   |  681 ++++++++
  fs/aufs/opts.c                                     | 1822 ++++++++++++++++++++
@@ -70,13 +69,13 @@
  fs/aufs/procfs.c                                   |  156 ++
  fs/aufs/rdu.c                                      |  375 ++++
  fs/aufs/rwsem.h                                    |  178 ++
- fs/aufs/sbinfo.c                                   |  343 ++++
+ fs/aufs/sbinfo.c                                   |  347 ++++
  fs/aufs/spl.h                                      |   98 ++
  fs/aufs/super.c                                    |  991 +++++++++++
- fs/aufs/super.h                                    |  622 +++++++
+ fs/aufs/super.h                                    |  625 +++++++
  fs/aufs/sysaufs.c                                  |   91 +
  fs/aufs/sysaufs.h                                  |   88 +
- fs/aufs/sysfs.c                                    |  336 ++++
+ fs/aufs/sysfs.c                                    |  340 ++++
  fs/aufs/sysrq.c                                    |  144 ++
  fs/aufs/vdir.c                                     |  875 ++++++++++
  fs/aufs/vfsub.c                                    |  835 +++++++++
@@ -87,7 +86,7 @@
  fs/aufs/wkq.c                                      |  200 +++
  fs/aufs/wkq.h                                      |   78 +
  fs/aufs/xattr.c                                    |  331 ++++
- fs/aufs/xino.c                                     | 1284 ++++++++++++++
+ fs/aufs/xino.c                                     | 1283 ++++++++++++++
  fs/buffer.c                                        |    2 +-
  fs/dcache.c                                        |    2 +-
  fs/proc/base.c                                     |    2 +-
@@ -106,13 +105,11 @@
  kernel/fork.c                                      |    2 +-
  mm/Makefile                                        |    2 +-
  mm/filemap.c                                       |    2 +-
- mm/madvise.c                                       |    4 +-
  mm/memory.c                                        |    2 +-
  mm/mmap.c                                          |   17 +-
- mm/msync.c                                         |    4 +-
  mm/nommu.c                                         |   10 +-
  mm/prfile.c                                        |   86 +
- 113 files changed, 33091 insertions(+), 34 deletions(-)
+ 111 files changed, 33141 insertions(+), 30 deletions(-)
 
 diff --git a/Documentation/ABI/testing/debugfs-aufs b/Documentation/ABI/testing/debugfs-aufs
 new file mode 100644
@@ -209,7 +206,7 @@ index 0000000..82f9518
 +		will be empty. About XINO files, see the aufs manual.
 diff --git a/Documentation/filesystems/aufs/README b/Documentation/filesystems/aufs/README
 new file mode 100644
-index 0000000..27faa06f
+index 0000000..2915102
 --- /dev/null
 +++ b/Documentation/filesystems/aufs/README
 @@ -0,0 +1,383 @@
@@ -576,7 +573,7 @@ index 0000000..27faa06f
 +The Parted Magic Project made a donation (2013/9 and 11).
 +Pavel Barta made a donation (2013/10).
 +Nikolay Pertsev made a donation (2014/5).
-+James B made a donation (2014/7).
++James B made a donation (2014/7 and 2015/7).
 +Stefano Di Biase made a donation (2014/8).
 +Daniel Epellei made a donation (2015/1).
 +
@@ -1718,10 +1715,10 @@ index 0000000..9d502b5
 +Currently this approach is applied to address_space_operations for
 +regular files only.
 diff --git a/MAINTAINERS b/MAINTAINERS
-index d8afd29..feac5ea 100644
+index b60e2b2..ae084ca 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -1880,6 +1880,19 @@ F:	include/linux/audit.h
+@@ -1941,6 +1941,19 @@ F:	include/linux/audit.h
  F:	include/uapi/linux/audit.h
  F:	kernel/audit*
  
@@ -1742,10 +1739,10 @@ index d8afd29..feac5ea 100644
  M:	Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
  W:	http://miguelojeda.es/auxdisplay.htm
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index d7173cb..0160952 100644
+index f7a4c9d..23103ad 100644
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
-@@ -540,6 +540,24 @@ static inline int is_loop_device(struct file *file)
+@@ -560,6 +560,24 @@ static inline int is_loop_device(struct file *file)
  	return i && S_ISBLK(i->i_mode) && MAJOR(i->i_rdev) == LOOP_MAJOR;
  }
  
@@ -1783,10 +1780,10 @@ index 011f433..b1083f6 100644
  endif # MISC_FILESYSTEMS
  
 diff --git a/fs/Makefile b/fs/Makefile
-index cb92fd4..8c2df12 100644
+index cb20e4b..dd81418 100644
 --- a/fs/Makefile
 +++ b/fs/Makefile
-@@ -127,3 +127,4 @@ obj-y				+= exofs/ # Multiple modules
+@@ -126,3 +126,4 @@ obj-y				+= exofs/ # Multiple modules
  obj-$(CONFIG_CEPH_FS)		+= ceph/
  obj-$(CONFIG_PSTORE)		+= pstore/
  obj-$(CONFIG_EFIVAR_FS)		+= efivarfs/
@@ -14453,10 +14450,10 @@ index 0000000..3943dc4
 +}
 diff --git a/fs/aufs/i_op.c b/fs/aufs/i_op.c
 new file mode 100644
-index 0000000..20f26b2
+index 0000000..a50cd4c
 --- /dev/null
 +++ b/fs/aufs/i_op.c
-@@ -0,0 +1,1434 @@
+@@ -0,0 +1,1470 @@
 +/*
 + * Copyright (C) 2005-2015 Junjiro R. Okajima
 + */
@@ -15688,101 +15685,137 @@ index 0000000..20f26b2
 +
 +/* ---------------------------------------------------------------------- */
 +
-+static int h_readlink(struct dentry *dentry, int bindex, char __user *buf,
-+		      int bufsiz)
++/*
++ * Assumption:
++ * - the number of symlinks is not so many.
++ *
++ * Structure:
++ * - sbinfo (instead of iinfo) contains an hlist of struct au_symlink.
++ *   If iinfo contained the hlist, then it would be rather large waste of memory
++ *   I am afraid.
++ * - struct au_symlink contains the necessary info for h_inode follow_link() and
++ *   put_link().
++ */
++
++struct au_symlink {
++	union {
++		struct hlist_node hlist;
++		struct rcu_head rcu;
++	};
++
++	struct inode *h_inode;
++	void *h_cookie;
++};
++
++static void au_symlink_add(struct super_block *sb, struct au_symlink *slink,
++			   struct inode *h_inode, void *cookie)
 +{
-+	int err;
-+	struct super_block *sb;
-+	struct dentry *h_dentry;
++	struct au_sbinfo *sbinfo;
++
++	ihold(h_inode);
++	slink->h_inode = h_inode;
++	slink->h_cookie = cookie;
++	sbinfo = au_sbi(sb);
++	au_sphl_add(&slink->hlist, &sbinfo->si_symlink);
++}
++
++static void au_symlink_del(struct super_block *sb, struct au_symlink *slink)
++{
++	struct au_sbinfo *sbinfo;
++
++	/* do not iput() within rcu */
++	iput(slink->h_inode);
++	slink->h_inode = NULL;
++	sbinfo = au_sbi(sb);
++	au_sphl_del_rcu(&slink->hlist, &sbinfo->si_symlink);
++	kfree_rcu(slink, rcu);
++}
++
++static const char *aufs_follow_link(struct dentry *dentry, void **cookie)
++{
++	const char *ret;
 +	struct inode *inode, *h_inode;
++	struct dentry *h_dentry;
++	struct au_symlink *slink;
++	int err;
++	aufs_bindex_t bindex;
++
++	ret = NULL; /* suppress a warning */
++	err = aufs_read_lock(dentry, AuLock_IR | AuLock_GEN);
++	if (unlikely(err))
++		goto out;
++
++	err = au_d_hashed_positive(dentry);
++	if (unlikely(err))
++		goto out_unlock;
 +
 +	err = -EINVAL;
-+	h_dentry = au_h_dptr(dentry, bindex);
-+	h_inode = d_inode(h_dentry);
-+	if (unlikely(!h_inode->i_op->readlink))
-+		goto out;
-+
-+	err = security_inode_readlink(h_dentry);
-+	if (unlikely(err))
-+		goto out;
-+
-+	sb = dentry->d_sb;
 +	inode = d_inode(dentry);
-+	if (!au_test_ro(sb, bindex, inode)) {
-+		vfsub_touch_atime(au_sbr_mnt(sb, bindex), h_dentry);
-+		fsstack_copy_attr_atime(inode, h_inode);
-+	}
-+	err = h_inode->i_op->readlink(h_dentry, buf, bufsiz);
-+
-+out:
-+	return err;
-+}
-+
-+static int aufs_readlink(struct dentry *dentry, char __user *buf, int bufsiz)
-+{
-+	int err;
-+
-+	err = aufs_read_lock(dentry, AuLock_IR | AuLock_GEN);
-+	if (unlikely(err))
-+		goto out;
-+	err = au_d_hashed_positive(dentry);
-+	if (!err)
-+		err = h_readlink(dentry, au_dbstart(dentry), buf, bufsiz);
-+	aufs_read_unlock(dentry, AuLock_IR);
-+
-+out:
-+	return err;
-+}
-+
-+static void *aufs_follow_link(struct dentry *dentry, struct nameidata *nd)
-+{
-+	int err;
-+	mm_segment_t old_fs;
-+	union {
-+		char *k;
-+		char __user *u;
-+	} buf;
++	bindex = au_ibstart(inode);
++	h_inode = au_h_iptr(inode, bindex);
++	if (unlikely(!h_inode->i_op->follow_link))
++		goto out_unlock;
 +
 +	err = -ENOMEM;
-+	buf.k = (void *)__get_free_page(GFP_NOFS);
-+	if (unlikely(!buf.k))
-+		goto out;
++	slink = kmalloc(sizeof(*slink), GFP_NOFS);
++	if (unlikely(!slink))
++		goto out_unlock;
 +
-+	err = aufs_read_lock(dentry, AuLock_IR | AuLock_GEN);
-+	if (unlikely(err))
-+		goto out_name;
-+
-+	err = au_d_hashed_positive(dentry);
-+	if (!err) {
-+		old_fs = get_fs();
-+		set_fs(KERNEL_DS);
-+		err = h_readlink(dentry, au_dbstart(dentry), buf.u, PATH_MAX);
-+		set_fs(old_fs);
++	err = -EBUSY;
++	h_dentry = NULL;
++	if (au_dbstart(dentry) <= bindex) {
++		h_dentry = au_h_dptr(dentry, bindex);
++		if (h_dentry)
++			dget(h_dentry);
 +	}
++	if (!h_dentry) {
++		h_dentry = d_find_any_alias(h_inode);
++		if (IS_ERR(h_dentry)) {
++			err = PTR_ERR(h_dentry);
++			goto out_free;
++		}
++	}
++	if (unlikely(!h_dentry))
++		goto out_free;
++
++	err = 0;
++	AuDbg("%pf\n", h_inode->i_op->follow_link);
++	AuDbgDentry(h_dentry);
++	ret = h_inode->i_op->follow_link(h_dentry, cookie);
++	dput(h_dentry);
++
++	if (!IS_ERR_OR_NULL(ret)) {
++		au_symlink_add(inode->i_sb, slink, h_inode, *cookie);
++		*cookie = slink;
++		AuDbg("slink %p\n", slink);
++		goto out_unlock; /* success */
++	}
++
++out_free:
++	slink->h_inode = NULL;
++	kfree_rcu(slink, rcu);
++out_unlock:
 +	aufs_read_unlock(dentry, AuLock_IR);
-+
-+	if (err >= 0) {
-+		buf.k[err] = 0;
-+		/* will be freed by put_link */
-+		nd_set_link(nd, buf.k);
-+		return NULL; /* success */
-+	}
-+
-+out_name:
-+	free_page((unsigned long)buf.k);
 +out:
-+	AuTraceErr(err);
-+	return ERR_PTR(err);
++	if (unlikely(err))
++		ret = ERR_PTR(err);
++	AuTraceErrPtr(ret);
++	return ret;
 +}
 +
-+static void aufs_put_link(struct dentry *dentry __maybe_unused,
-+			  struct nameidata *nd, void *cookie __maybe_unused)
++static void aufs_put_link(struct inode *inode, void *cookie)
 +{
-+	char *p;
++	struct au_symlink *slink;
++	struct inode *h_inode;
 +
-+	p = nd_get_link(nd);
-+	if (!IS_ERR_OR_NULL(p))
-+		free_page((unsigned long)p);
++	slink = cookie;
++	AuDbg("slink %p\n", slink);
++	h_inode = slink->h_inode;
++	AuDbg("%pf\n", h_inode->i_op->put_link);
++	AuDbgInode(h_inode);
++	if (h_inode->i_op->put_link)
++		h_inode->i_op->put_link(h_inode, slink->h_cookie);
++	au_symlink_del(inode->i_sb, slink);
 +}
 +
 +/* ---------------------------------------------------------------------- */
@@ -15833,7 +15866,7 @@ index 0000000..20f26b2
 +	.removexattr	= aufs_removexattr,
 +#endif
 +
-+	.readlink	= aufs_readlink,
++	.readlink	= generic_readlink,
 +	.follow_link	= aufs_follow_link,
 +	.put_link	= aufs_put_link,
 +
@@ -20191,10 +20224,10 @@ index 0000000..4f83bdf
 +endif
 diff --git a/fs/aufs/module.c b/fs/aufs/module.c
 new file mode 100644
-index 0000000..64b6fdc
+index 0000000..a7a4b364
 --- /dev/null
 +++ b/fs/aufs/module.c
-@@ -0,0 +1,196 @@
+@@ -0,0 +1,204 @@
 +/*
 + * Copyright (C) 2005-2015 Junjiro R. Okajima
 + */
@@ -20303,7 +20336,15 @@ index 0000000..64b6fdc
 +
 +int au_seq_path(struct seq_file *seq, struct path *path)
 +{
-+	return seq_path(seq, path, au_esc_chars);
++	int err;
++
++	err = seq_path(seq, path, au_esc_chars);
++	if (err > 0)
++		err = 0;
++	else if (err < 0)
++		err = -ENOMEM;
++
++	return err;
 +}
 +
 +/* ---------------------------------------------------------------------- */
@@ -24593,10 +24634,10 @@ index 0000000..171ee0c
 +#endif /* __AUFS_RWSEM_H__ */
 diff --git a/fs/aufs/sbinfo.c b/fs/aufs/sbinfo.c
 new file mode 100644
-index 0000000..5793673
+index 0000000..cb7ac83
 --- /dev/null
 +++ b/fs/aufs/sbinfo.c
-@@ -0,0 +1,343 @@
+@@ -0,0 +1,347 @@
 +/*
 + * Copyright (C) 2005-2015 Junjiro R. Okajima
 + */
@@ -24621,6 +24662,8 @@ index 0000000..5793673
 +		AuDebugOn(!hlist_empty(&sbinfo->si_plink[i].head));
 +	AuDebugOn(atomic_read(&sbinfo->si_nowait.nw_len));
 +
++	AuDebugOn(!hlist_empty(&sbinfo->si_symlink.head));
++
 +	au_rw_write_lock(&sbinfo->si_rwsem);
 +	au_br_free(sbinfo);
 +	au_rw_write_unlock(&sbinfo->si_rwsem);
@@ -24687,6 +24730,8 @@ index 0000000..5793673
 +
 +	sbinfo->si_mntflags = au_opts_plink(AuOpt_Def);
 +
++	au_sphl_init(&sbinfo->si_symlink);
++
 +	sbinfo->si_xino_jiffy = jiffies;
 +	sbinfo->si_xino_expire
 +		= msecs_to_jiffies(AUFS_XINO_DEF_SEC * MSEC_PER_SEC);
@@ -25046,7 +25091,7 @@ index 0000000..a66d39e
 +#endif /* __AUFS_SPL_H__ */
 diff --git a/fs/aufs/super.c b/fs/aufs/super.c
 new file mode 100644
-index 0000000..ee5780d
+index 0000000..7ae6ea1
 --- /dev/null
 +++ b/fs/aufs/super.c
 @@ -0,0 +1,991 @@
@@ -25143,7 +25188,7 @@ index 0000000..ee5780d
 +		path.mnt = au_br_mnt(br);
 +		path.dentry = hdp[bindex].hd_dentry;
 +		err = au_seq_path(seq, &path);
-+		if (err > 0) {
++		if (!err) {
 +			au_optstr_br_perm(&perm, br->br_perm);
 +			err = seq_printf(seq, "=%s", perm.a);
 +			if (err == -1)
@@ -26043,10 +26088,10 @@ index 0000000..ee5780d
 +};
 diff --git a/fs/aufs/super.h b/fs/aufs/super.h
 new file mode 100644
-index 0000000..f37d89d
+index 0000000..8ec54fa
 --- /dev/null
 +++ b/fs/aufs/super.h
-@@ -0,0 +1,622 @@
+@@ -0,0 +1,625 @@
 +/*
 + * Copyright (C) 2005-2015 Junjiro R. Okajima
 + */
@@ -26179,6 +26224,9 @@ index 0000000..f37d89d
 +	/* include/asm-ia64/siginfo.h defines a macro named si_flags */
 +	unsigned int		si_mntflags;
 +
++	/* symlink to follow_link() and put_link() */
++	struct au_sphlhead	si_symlink;
++
 +	/* external inode number (bitmap and translation table) */
 +	vfs_readf_t		si_xread;
 +	vfs_writef_t		si_xwrite;
@@ -26862,10 +26910,10 @@ index 0000000..feb78fd
 +#endif /* __SYSAUFS_H__ */
 diff --git a/fs/aufs/sysfs.c b/fs/aufs/sysfs.c
 new file mode 100644
-index 0000000..75cc82a
+index 0000000..cc74d02
 --- /dev/null
 +++ b/fs/aufs/sysfs.c
-@@ -0,0 +1,336 @@
+@@ -0,0 +1,340 @@
 +/*
 + * Copyright (C) 2005-2015 Junjiro R. Okajima
 + */
@@ -26929,9 +26977,11 @@ index 0000000..75cc82a
 +	case AuBrSysfs_BR:
 +		path.mnt = au_br_mnt(br);
 +		path.dentry = au_h_dptr(root, bindex);
-+		au_seq_path(seq, &path);
-+		au_optstr_br_perm(&perm, br->br_perm);
-+		err = seq_printf(seq, "=%s\n", perm.a);
++		err = au_seq_path(seq, &path);
++		if (!err) {
++			au_optstr_br_perm(&perm, br->br_perm);
++			err = seq_printf(seq, "=%s\n", perm.a);
++		}
 +		break;
 +	case AuBrSysfs_BRID:
 +		err = seq_printf(seq, "%d\n", br->br_id);
@@ -27092,7 +27142,9 @@ index 0000000..75cc82a
 +		if (unlikely(err))
 +			break;
 +
-+		au_seq_path(seq, &br->br_path);
++		err = au_seq_path(seq, &br->br_path);
++		if (unlikely(err))
++			break;
 +		err = seq_putc(seq, '\0');
 +		if (!err && seq->count <= sz) {
 +			err = copy_to_user(arg->path, seq->buf, seq->count);
@@ -31874,10 +31926,10 @@ index 0000000..c1695b3
 +#endif
 diff --git a/fs/aufs/xino.c b/fs/aufs/xino.c
 new file mode 100644
-index 0000000..8a2ddac
+index 0000000..f377ce5
 --- /dev/null
 +++ b/fs/aufs/xino.c
-@@ -0,0 +1,1284 @@
+@@ -0,0 +1,1283 @@
 +/*
 + * Copyright (C) 2005-2015 Junjiro R. Okajima
 + */
@@ -33149,10 +33201,9 @@ index 0000000..8a2ddac
 +	int err;
 +
 +	err = au_seq_path(seq, &file->f_path);
-+	if (unlikely(err < 0))
++	if (unlikely(err))
 +		goto out;
 +
-+	err = 0;
 +#define Deleted "\\040(deleted)"
 +	seq->count -= sizeof(Deleted) - 1;
 +	AuDebugOn(memcmp(seq->buf + seq->count, Deleted,
@@ -33163,10 +33214,10 @@ index 0000000..8a2ddac
 +	return err;
 +}
 diff --git a/fs/buffer.c b/fs/buffer.c
-index c7a5602..8c50a22 100644
+index 1cf7a53..076aff8 100644
 --- a/fs/buffer.c
 +++ b/fs/buffer.c
-@@ -2450,7 +2450,7 @@ int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,
+@@ -2473,7 +2473,7 @@ int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,
  	 * Update file times before taking page lock. We may end up failing the
  	 * fault so this update may be superfluous but who really cares...
  	 */
@@ -33176,10 +33227,10 @@ index c7a5602..8c50a22 100644
  	ret = __block_page_mkwrite(vma, vmf, get_block);
  	sb_end_pagefault(sb);
 diff --git a/fs/dcache.c b/fs/dcache.c
-index 37b5afd..bc261e2 100644
+index 9b5fe50..aa8310e 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
-@@ -1164,7 +1164,7 @@ enum d_walk_ret {
+@@ -1167,7 +1167,7 @@ enum d_walk_ret {
   *
   * The @enter() and @finish() callbacks are called with d_lock held.
   */
@@ -33189,10 +33240,10 @@ index 37b5afd..bc261e2 100644
  		   void (*finish)(void *))
  {
 diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 093ca14..fc1ac03 100644
+index aa50d1a..f219321 100644
 --- a/fs/proc/base.c
 +++ b/fs/proc/base.c
-@@ -1744,7 +1744,7 @@ static int proc_map_files_get_link(struct dentry *dentry, struct path *path)
+@@ -1939,7 +1939,7 @@ static int proc_map_files_get_link(struct dentry *dentry, struct path *path)
  	down_read(&mm->mmap_sem);
  	vma = find_exact_vma(mm, vm_start, vm_end);
  	if (vma && vma->vm_file) {
@@ -33202,7 +33253,7 @@ index 093ca14..fc1ac03 100644
  		rc = 0;
  	}
 diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
-index d4a3574..1397181 100644
+index f8595e8..cb8eda0 100644
 --- a/fs/proc/nommu.c
 +++ b/fs/proc/nommu.c
 @@ -45,7 +45,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
@@ -33218,7 +33269,7 @@ index d4a3574..1397181 100644
  		ino = inode->i_ino;
  	}
 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index 6dee68d..9afa35d 100644
+index ca1e091..8940e47 100644
 --- a/fs/proc/task_mmu.c
 +++ b/fs/proc/task_mmu.c
 @@ -279,7 +279,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
@@ -33243,7 +33294,7 @@ index 6dee68d..9afa35d 100644
  	struct mm_walk walk = {
  		.hugetlb_entry = gather_hugetlb_stats,
 diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
-index 599ec2e..1740207 100644
+index e0d64c9..7aa92db 100644
 --- a/fs/proc/task_nommu.c
 +++ b/fs/proc/task_nommu.c
 @@ -160,7 +160,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
@@ -33292,10 +33343,10 @@ index 819ef3f..fd0414e 100644
  {
  	mm_segment_t old_fs;
 diff --git a/fs/splice.c b/fs/splice.c
-index bfe62ae..fa5eee5 100644
+index 5fc1e50..5f8385a 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -1101,8 +1101,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+@@ -1102,8 +1102,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
  /*
   * Attempt to initiate a splice from pipe to file.
   */
@@ -33306,7 +33357,7 @@ index bfe62ae..fa5eee5 100644
  {
  	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
  				loff_t *, size_t, unsigned int);
-@@ -1118,9 +1118,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1119,9 +1119,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
  /*
   * Attempt to initiate a splice from a file to a pipe.
   */
@@ -33332,10 +33383,10 @@ index f87d308..9a290b3 100644
  static inline void fput_light(struct file *file, int fput_needed)
  {
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 35ec87e..3229f97 100644
+index 84b783f..0e3fd62 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -1649,6 +1649,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
+@@ -1677,6 +1677,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
  			      struct iovec *fast_pointer,
  			      struct iovec **ret_pointer);
  
@@ -33349,10 +33400,10 @@ index 35ec87e..3229f97 100644
  extern ssize_t __vfs_write(struct file *, const char __user *, size_t, loff_t *);
  extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 0755b9f..2ee5500 100644
+index bf6f117..65977ac9 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1172,6 +1172,28 @@ static inline int fixup_user_fault(struct task_struct *tsk,
+@@ -1201,6 +1201,28 @@ static inline int fixup_user_fault(struct task_struct *tsk,
  }
  #endif
  
@@ -33382,10 +33433,10 @@ index 0755b9f..2ee5500 100644
  extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
  		void *buf, int len, int write);
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 8d37e26..ce89d4c 100644
+index 1554957..9697ae1 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
-@@ -241,6 +241,7 @@ struct vm_region {
+@@ -250,6 +250,7 @@ struct vm_region {
  	unsigned long	vm_top;		/* region allocated to here */
  	unsigned long	vm_pgoff;	/* the offset in vm_file corresponding to vm_start */
  	struct file	*vm_file;	/* the backing file or NULL */
@@ -33393,7 +33444,7 @@ index 8d37e26..ce89d4c 100644
  
  	int		vm_usage;	/* region usage count (access under nommu_region_sem) */
  	bool		vm_icache_flushed : 1; /* true if the icache has been flushed for
-@@ -305,6 +306,7 @@ struct vm_area_struct {
+@@ -314,6 +315,7 @@ struct vm_area_struct {
  	unsigned long vm_pgoff;		/* Offset (within vm_file) in PAGE_SIZE
  					   units, *not* PAGE_CACHE_SIZE */
  	struct file * vm_file;		/* File we map to (can be NULL). */
@@ -33417,7 +33468,7 @@ index da2751d..2e0fca6 100644
 +			 unsigned int flags);
  #endif
 diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
-index 1a0006a..ddad01a 100644
+index 1ff9942..31efc0a 100644
 --- a/include/uapi/linux/Kbuild
 +++ b/include/uapi/linux/Kbuild
 @@ -59,6 +59,7 @@ header-y += atmsvc.h
@@ -33430,7 +33481,7 @@ index 1a0006a..ddad01a 100644
  header-y += auxvec.h
 diff --git a/include/uapi/linux/aufs_type.h b/include/uapi/linux/aufs_type.h
 new file mode 100644
-index 0000000..a06c985
+index 0000000..9822d76
 --- /dev/null
 +++ b/include/uapi/linux/aufs_type.h
 @@ -0,0 +1,406 @@
@@ -33462,7 +33513,7 @@ index 0000000..a06c985
 +
 +#include <linux/limits.h>
 +
-+#define AUFS_VERSION	"4.x-rcN"
++#define AUFS_VERSION	"4.2"
 +
 +/* todo? move this to linux-2.6.19/include/magic.h */
 +#define AUFS_SUPER_MAGIC	('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
@@ -33841,10 +33892,10 @@ index 0000000..a06c985
 +
 +#endif /* __AUFS_TYPE_H__ */
 diff --git a/kernel/fork.c b/kernel/fork.c
-index 03c1eaa..7e215ba 100644
+index dbd9b8d..4549e0d 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
-@@ -456,7 +456,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+@@ -461,7 +461,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
  			struct inode *inode = file_inode(file);
  			struct address_space *mapping = file->f_mapping;
  
@@ -33867,10 +33918,10 @@ index 98c4eae..3f0c9b9 100644
  obj-y += init-mm.o
  
 diff --git a/mm/filemap.c b/mm/filemap.c
-index 6bf5e42..a863d0f 100644
+index 1283fc8..128f18f 100644
 --- a/mm/filemap.c
 +++ b/mm/filemap.c
-@@ -2062,7 +2062,7 @@ int filemap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
+@@ -2089,7 +2089,7 @@ int filemap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
  	int ret = VM_FAULT_LOCKED;
  
  	sb_start_pagefault(inode->i_sb);
@@ -33879,27 +33930,8 @@ index 6bf5e42..a863d0f 100644
  	lock_page(page);
  	if (page->mapping != inode->i_mapping) {
  		unlock_page(page);
-diff --git a/mm/madvise.c b/mm/madvise.c
-index d551475..1ebf71b 100644
---- a/mm/madvise.c
-+++ b/mm/madvise.c
-@@ -320,12 +320,12 @@ static long madvise_remove(struct vm_area_struct *vma,
- 	 * vma's reference to the file) can go away as soon as we drop
- 	 * mmap_sem.
- 	 */
--	get_file(f);
-+	vma_get_file(vma);
- 	up_read(&current->mm->mmap_sem);
- 	error = vfs_fallocate(f,
- 				FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
- 				offset, end - start);
--	fput(f);
-+	vma_fput(vma);
- 	down_read(&current->mm->mmap_sem);
- 	return error;
- }
 diff --git a/mm/memory.c b/mm/memory.c
-index 22e037e..62096a2 100644
+index 388dcf9..ee1a3ef 100644
 --- a/mm/memory.c
 +++ b/mm/memory.c
 @@ -2034,7 +2034,7 @@ static inline int wp_page_reuse(struct mm_struct *mm,
@@ -33912,7 +33944,7 @@ index 22e037e..62096a2 100644
  
  	return VM_FAULT_WRITE;
 diff --git a/mm/mmap.c b/mm/mmap.c
-index bb50cac..1ab5e596 100644
+index aa632ad..3ff75d3 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -274,7 +274,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
@@ -33991,28 +34023,11 @@ index bb50cac..1ab5e596 100644
  			if (new_vma->vm_ops && new_vma->vm_ops->open)
  				new_vma->vm_ops->open(new_vma);
  			vma_link(mm, new_vma, prev, rb_link, rb_parent);
-diff --git a/mm/msync.c b/mm/msync.c
-index bb04d53..5c24c54 100644
---- a/mm/msync.c
-+++ b/mm/msync.c
-@@ -84,10 +84,10 @@ SYSCALL_DEFINE3(msync, unsigned long, start, size_t, len, int, flags)
- 		start = vma->vm_end;
- 		if ((flags & MS_SYNC) && file &&
- 				(vma->vm_flags & VM_SHARED)) {
--			get_file(file);
-+			vma_get_file(vma);
- 			up_read(&mm->mmap_sem);
- 			error = vfs_fsync_range(file, fstart, fend, 1);
--			fput(file);
-+			vma_fput(vma);
- 			if (error || start >= end)
- 				goto out;
- 			down_read(&mm->mmap_sem);
 diff --git a/mm/nommu.c b/mm/nommu.c
-index e544508..dd6f74a 100644
+index 58ea364..f937b7e 100644
 --- a/mm/nommu.c
 +++ b/mm/nommu.c
-@@ -693,7 +693,7 @@ static void __put_nommu_region(struct vm_region *region)
+@@ -671,7 +671,7 @@ static void __put_nommu_region(struct vm_region *region)
  		up_write(&nommu_region_sem);
  
  		if (region->vm_file)
@@ -34021,7 +34036,7 @@ index e544508..dd6f74a 100644
  
  		/* IO memory and memory shared directly out of the pagecache
  		 * from ramfs/tmpfs mustn't be released here */
-@@ -858,7 +858,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -829,7 +829,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
  	if (vma->vm_ops && vma->vm_ops->close)
  		vma->vm_ops->close(vma);
  	if (vma->vm_file)
@@ -34030,7 +34045,7 @@ index e544508..dd6f74a 100644
  	put_nommu_region(vma->vm_region);
  	kmem_cache_free(vm_area_cachep, vma);
  }
-@@ -1398,7 +1398,7 @@ unsigned long do_mmap_pgoff(struct file *file,
+@@ -1354,7 +1354,7 @@ unsigned long do_mmap_pgoff(struct file *file,
  					goto error_just_free;
  				}
  			}
@@ -34039,7 +34054,7 @@ index e544508..dd6f74a 100644
  			kmem_cache_free(vm_region_jar, region);
  			region = pregion;
  			result = start;
-@@ -1474,10 +1474,10 @@ error_just_free:
+@@ -1429,10 +1429,10 @@ error_just_free:
  	up_write(&nommu_region_sem);
  error:
  	if (region->vm_file)
@@ -34050,11 +34065,11 @@ index e544508..dd6f74a 100644
 -		fput(vma->vm_file);
 +		vma_fput(vma);
  	kmem_cache_free(vm_area_cachep, vma);
- 	kleave(" = %d", ret);
  	return ret;
+ 
 diff --git a/mm/prfile.c b/mm/prfile.c
 new file mode 100644
-index 0000000..6aa5ab5
+index 0000000..b323b8a
 --- /dev/null
 +++ b/mm/prfile.c
 @@ -0,0 +1,86 @@
@@ -34079,7 +34094,7 @@ index 0000000..6aa5ab5
 +{
 +#ifdef PRFILE_TRACE
 +	if (pr)
-+		pr_info("%s:%d: %s, %p\n", func, line, func2,
++		pr_info("%s:%d: %s, %s\n", func, line, func2,
 +			f ? (char *)f->f_path.dentry->d_name.name : "(null)");
 +#endif
 +}

kernel/kernel/files/patches/mageia/fs-btrfs-fix-possible-leak-in-btrfs_ioctl_balance.patch

@@ -0,0 +1,53 @@
+From 0f89abf56abbd0e1c6e3cef9813e6d9f05383c1e Mon Sep 17 00:00:00 2001
+From: Christian Engelmayer <cengelma@gmx.at>
+Date: Wed, 21 Oct 2015 00:50:06 +0200
+Subject: btrfs: fix possible leak in btrfs_ioctl_balance()
+
+Commit 8eb934591f8b ("btrfs: check unsupported filters in balance
+arguments") adds a jump to exit label out_bargs in case the argument
+check fails. At this point in addition to the bargs memory, the
+memory for struct btrfs_balance_control has already been allocated.
+Ownership of bctl is passed to btrfs_balance() in the good case,
+thus the memory is not freed due to the introduced jump. Make sure
+that the memory gets freed in any case as necessary. Detected by
+Coverity CID 1328378.
+
+Signed-off-by: Christian Engelmayer <cengelma@gmx.at>
+Reviewed-by: David Sterba <dsterba@suse.com>
+Signed-off-by: Chris Mason <clm@fb.com>
+---
+ fs/btrfs/ioctl.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
+index 3e3e613..8d20f3b 100644
+--- a/fs/btrfs/ioctl.c
++++ b/fs/btrfs/ioctl.c
+@@ -4641,7 +4641,7 @@ locked:
+ 
+ 	if (bctl->flags & ~(BTRFS_BALANCE_ARGS_MASK | BTRFS_BALANCE_TYPE_MASK)) {
+ 		ret = -EINVAL;
+-		goto out_bargs;
++		goto out_bctl;
+ 	}
+ 
+ do_balance:
+@@ -4655,12 +4655,15 @@ do_balance:
+ 	need_unlock = false;
+ 
+ 	ret = btrfs_balance(bctl, bargs);
++	bctl = NULL;
+ 
+ 	if (arg) {
+ 		if (copy_to_user(arg, bargs, sizeof(*bargs)))
+ 			ret = -EFAULT;
+ 	}
+ 
++out_bctl:
++	kfree(bctl);
+ out_bargs:
+ 	kfree(bargs);
+ out_unlock:
+-- 
+cgit v0.11.2
+

kernel/kernel/files/patches/mageia/gpu-drm-mach64.patch

@@ -4134,10 +4134,10 @@ head: c99566fb810c9d8cae5e9cd39d1772b55e2f514c
  	depends on DRM && PCI
 --- linux/drivers/gpu/drm/Makefile.gpu-drm-mach64.orig
 +++ linux/drivers/gpu/drm/Makefile
-@@ -39,6 +39,7 @@ obj-$(CONFIG_DRM_TDFX)	+= tdfx/
- obj-$(CONFIG_DRM_R128)	+= r128/
+@@ -38,6 +38,7 @@ obj-$(CONFIG_DRM_R128)	+= r128/
  obj-$(CONFIG_HSA_AMD) += amd/amdkfd/
  obj-$(CONFIG_DRM_RADEON)+= radeon/
+ obj-$(CONFIG_DRM_AMDGPU)+= amd/amdgpu/
 +obj-$(CONFIG_DRM_MACH64)+= mach64/
  obj-$(CONFIG_DRM_MGA)	+= mga/
  obj-$(CONFIG_DRM_I810)	+= i810/

kernel/kernel/files/patches/mageia/input-alps-Only-the-Dell-Latitude-D420_430_620_630-have-separate-stick-button-bits.patch

@@ -0,0 +1,115 @@
+From: Hans de Goede <hdegoede@redhat.com>
+Subject: [PATCH] alps: Only the Dell Latitude D420/430/620/630 have separate stick button bits
+Date: Wed, 21 Oct 2015 10:16:18 +0200
+
+commit 92bac83dd79e ("Input: alps - non interleaved V2 dualpoint has
+separate stick button bits") assumes that all alps v2 non-interleaved
+dual point setups have the separate stick button bits.
+
+Later we limited this to Dell laptops only because of reports that this
+broke things on non Dell laptops. Now it turns out that this breaks things
+on the Dell Latitude D600 too. So it seems that only the Dell Latitude
+D420/430/620/630, which all share the same touchpad / stick combo,
+have these separate bits.
+
+This patch limits the checking of the separate bits to only these models
+fixing regressions with other models.
+
+Reported-and-tested-by: Larry Finger <Larry.Finger@lwfinger.net>
+Cc: stable@vger.kernel.org
+Tested-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/input/mouse/alps.c | 48 ++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 42 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
+index 4d24686..41e6cb5 100644
+--- a/drivers/input/mouse/alps.c
++++ b/drivers/input/mouse/alps.c
+@@ -100,7 +100,7 @@ static const struct alps_nibble_commands alps_v6_nibble_commands[] = {
+ #define ALPS_FOUR_BUTTONS	0x40	/* 4 direction button present */
+ #define ALPS_PS2_INTERLEAVED	0x80	/* 3-byte PS/2 packet interleaved with
+ 					   6-byte ALPS packet */
+-#define ALPS_DELL		0x100	/* device is a Dell laptop */
++#define ALPS_STICK_BITS		0x100	/* separate stick button bits */
+ #define ALPS_BUTTONPAD		0x200	/* device is a clickpad */
+ 
+ static const struct alps_model_info alps_model_data[] = {
+@@ -159,6 +159,43 @@ static const struct alps_protocol_info alps_v8_protocol_data = {
+ 	ALPS_PROTO_V8, 0x18, 0x18, 0
+ };
+ 
++/*
++ * Some v2 models report the stick buttons in separate bits
++ */
++static const struct dmi_system_id alps_dmi_has_separate_stick_buttons[] = {
++#if defined(CONFIG_DMI) && defined(CONFIG_X86)
++	{
++		/* Extrapolated from other entries */
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
++			DMI_MATCH(DMI_PRODUCT_NAME, "Latitude D420"),
++		},
++	},
++	{
++		/* Reported-by: Hans de Bruin <jmdebruin@xmsnet.nl> */
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
++			DMI_MATCH(DMI_PRODUCT_NAME, "Latitude D430"),
++		},
++	},
++	{
++		/* Reported-by: Hans de Goede <hdegoede@redhat.com> */
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
++			DMI_MATCH(DMI_PRODUCT_NAME, "Latitude D620"),
++		},
++	},
++	{
++		/* Extrapolated from other entries */
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
++			DMI_MATCH(DMI_PRODUCT_NAME, "Latitude D630"),
++		},
++	},
++#endif
++	{ }
++};
++
+ static void alps_set_abs_params_st(struct alps_data *priv,
+ 				   struct input_dev *dev1);
+ static void alps_set_abs_params_semi_mt(struct alps_data *priv,
+@@ -253,9 +290,8 @@ static void alps_process_packet_v1_v2(struct psmouse *psmouse)
+ 		return;
+ 	}
+ 
+-	/* Dell non interleaved V2 dualpoint has separate stick button bits */
+-	if (priv->proto_version == ALPS_PROTO_V2 &&
+-	    priv->flags == (ALPS_DELL | ALPS_PASS | ALPS_DUALPOINT)) {
++	/* Some models have separate stick button bits */
++	if (priv->flags & ALPS_STICK_BITS) {
+ 		left |= packet[0] & 1;
+ 		right |= packet[0] & 2;
+ 		middle |= packet[0] & 4;
+@@ -2552,8 +2588,6 @@ static int alps_set_protocol(struct psmouse *psmouse,
+ 	priv->byte0 = protocol->byte0;
+ 	priv->mask0 = protocol->mask0;
+ 	priv->flags = protocol->flags;
+-	if (dmi_name_in_vendors("Dell"))
+-		priv->flags |= ALPS_DELL;
+ 
+ 	priv->x_max = 2000;
+ 	priv->y_max = 1400;
+@@ -2568,6 +2602,8 @@ static int alps_set_protocol(struct psmouse *psmouse,
+ 		priv->set_abs_params = alps_set_abs_params_st;
+ 		priv->x_max = 1023;
+ 		priv->y_max = 767;
++		if (dmi_check_system(alps_dmi_has_separate_stick_buttons))
++			priv->flags |= ALPS_STICK_BITS;
+ 		break;
+ 
+ 	case ALPS_PROTO_V3:
+-- 
+2.5.0
+

kernel/kernel/files/patches/mageia/media-Fix-regression-in-some-more-dib0700-based-devi.patch

@@ -1,53 +0,0 @@
-From: Thomas Reitmayr <treitmayr@devbase.at>
-Date: Fri, 1 May 2015 20:18:04 -0300
-Subject: [PATCH] media: Fix regression in some more dib0700 based devices
-
-Fix an oops during device initialization by correctly setting size_of_priv
-instead of leaving it 0.
-The regression was introduced by 8abe4a0a3f6d4217b16a ("[media] dib7000:
-export just one symbol") and only fixed for one type of dib0700 based
-devices in 9e334c75642b6e5bfb95 ("[media] Fix regression in some dib0700
-based devices").
-
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=92301
-
-Fixes: 8abe4a0a3f6d4217b16a ("[media] dib7000: export just one symbol")
-
-Cc: stable@vger.kernel.org # for version 3.17+
-Signed-off-by: Thomas Reitmayr <treitmayr@devbase.at>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
----
- drivers/media/usb/dvb-usb/dib0700_devices.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c
-index d7d55a20e959..c170523226aa 100644
---- a/drivers/media/usb/dvb-usb/dib0700_devices.c
-+++ b/drivers/media/usb/dvb-usb/dib0700_devices.c
-@@ -3944,6 +3944,8 @@ struct dvb_usb_device_properties dib0700_devices[] = {
- 
- 				DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
- 			}},
-+				.size_of_priv = sizeof(struct
-+						dib0700_adapter_state),
- 			}, {
- 			.num_frontends = 1,
- 			.fe = {{
-@@ -3956,6 +3958,8 @@ struct dvb_usb_device_properties dib0700_devices[] = {
- 
- 				DIB0700_DEFAULT_STREAMING_CONFIG(0x03),
- 			}},
-+				.size_of_priv = sizeof(struct
-+						dib0700_adapter_state),
- 			}
- 		},
- 
-@@ -4009,6 +4013,8 @@ struct dvb_usb_device_properties dib0700_devices[] = {
- 
- 				DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
- 			}},
-+				.size_of_priv = sizeof(struct
-+						dib0700_adapter_state),
- 			},
- 		},
- 

kernel/kernel/files/patches/mageia/net-netfilter-psd-mdv.patch

@@ -208,7 +208,7 @@ diff -p -up linux-2.6.28/net/ipv4/netfilter/ipt_psd.c.orig linux-2.6.28/net/ipv4
 +module_exit(ipt_psd_fini);
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig
-@@ -69,6 +69,14 @@ config IP_NF_MATCH_ECN
+@@ -193,6 +193,14 @@ config IP_NF_MATCH_ECN
  	(e.g. when running oldconfig). It selects
  	CONFIG_NETFILTER_XT_MATCH_ECN.
  
@@ -222,7 +222,7 @@ diff -p -up linux-2.6.28/net/ipv4/netfilter/ipt_psd.c.orig linux-2.6.28/net/ipv4
 +
  config IP_NF_MATCH_RPFILTER
  	tristate '"rpfilter" reverse path filter match support'
- 	depends on NETFILTER_ADVANCED && (IP_NF_MANGLE || IP_NF_RAW)
+ 	depends on NETFILTER_ADVANCED
 --- linux/include/uapi/linux/netfilter_ipv4/Kbuild.orig
 +++ linux/include/uapi/linux/netfilter_ipv4/Kbuild
 @@ -8,4 +8,5 @@ header-y += ipt_REJECT.h

kernel/kernel/files/patches/mageia/net-wireless-iwlwifi-fix-firmware-filename-for-3160.patch

@@ -0,0 +1,32 @@
+From b5a48134f8af08f5243328f8a0b05fc5ae7cf343 Mon Sep 17 00:00:00 2001
+From: Johannes Berg <johannes.berg@intel.com>
+Date: Tue, 22 Sep 2015 10:47:27 +0200
+Subject: [PATCH] iwlwifi: fix firmware filename for 3160
+
+The MODULE_FIRMWARE() for 3160 should be using the 7260 version as
+it's done in the device configuration struct instead of referencing
+IWL3160_UCODE_API_OK which doesn't even exist.
+
+Cc: <stable@vger.kernel.org> [3.8+]
+Reported-by: Hauke Mehrtens <hauke@hauke-m.de>
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
+---
+ drivers/net/wireless/iwlwifi/iwl-7000.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/wireless/iwlwifi/iwl-7000.c b/drivers/net/wireless/iwlwifi/iwl-7000.c
+index 6951aba..3fb327d 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-7000.c
++++ b/drivers/net/wireless/iwlwifi/iwl-7000.c
+@@ -348,6 +348,6 @@ const struct iwl_cfg iwl7265d_n_cfg = {
+ };
+ 
+ MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));
+-MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3160_UCODE_API_OK));
++MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));
+ MODULE_FIRMWARE(IWL7265_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));
+ MODULE_FIRMWARE(IWL7265D_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));
+-- 
+2.6.2
+

kernel/kernel/files/patches/mageia/net-wireless-rtlwifi-rtl8821ae-Fix-system-lockups-on-boot.patch

@@ -0,0 +1,148 @@
+From: Larry Finger <Larry.Finger@lwfinger.net>
+Subject: [PATCH] rtlwifi: rtl8821ae: Fix system lockups on boot
+Date: Fri,  2 Oct 2015 11:44:30 -0500
+
+In commit 1277fa2ab2f9, the code that cleared all interrupt enable
+bits before setting them was removed for all PCI drivers. This fixed an
+issue that caused TX to be blocked for 3-5 seconds. On some RTL8821AE units,
+this change causes soft lockups to occur on boot. For that reason, the portion
+of the earlier commit that applied to rtl8821ae is reverted. Kernels 4.1 and
+newer are affected.
+
+See http://marc.info/?l=linux-wireless&m=144373370103285&w=2 and
+https://bugzilla.opensuse.org/show_bug.cgi?id=944978 for two cases where
+this regression affected user systems. Note that this bug does not appear on
+any of the developer's setups. For those users whose systems are affected
+by the TX blockage, but do not lock up on boot, a module parameter is added
+to disable the interrupt clear
+
+Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
+Cc: Stable <stable@vger.kernel.org> [V4.1+]
+---
+
+Kalle,
+
+If possible, please send this patch upstream for inclusion in kernel 4.3.
+As noted, the bug affects kernels 4.1 and newer.
+
+This patch applies to wireless-drivers-next, and assumes that the patch that
+moved all the Realtek drivers into drivers/net/wireless/realtek has NOT been
+applied.
+
+Thanks,
+
+Larry
+---
+ drivers/net/wireless/rtlwifi/pci.h          |  2 ++
+ drivers/net/wireless/rtlwifi/rtl8821ae/hw.c | 17 +++++++++++++++++
+ drivers/net/wireless/rtlwifi/rtl8821ae/sw.c |  5 +++++
+ drivers/net/wireless/rtlwifi/wifi.h         |  3 +++
+ 4 files changed, 27 insertions(+)
+
+diff --git a/drivers/net/wireless/rtlwifi/pci.h b/drivers/net/wireless/rtlwifi/pci.h
+index d4567d1..5da6703 100644
+--- a/drivers/net/wireless/rtlwifi/pci.h
++++ b/drivers/net/wireless/rtlwifi/pci.h
+@@ -247,6 +247,8 @@ struct rtl_pci {
+ 	/* MSI support */
+ 	bool msi_support;
+ 	bool using_msi;
++	/* interrupt clear before set */
++	bool int_clear;
+ };
+ 
+ struct mp_adapter {
+diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
+index b7f18e21..6e9418e 100644
+--- a/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
++++ b/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
+@@ -2253,11 +2253,28 @@ void rtl8821ae_set_qos(struct ieee80211_hw *hw, int aci)
+ 	}
+ }
+ 
++static void rtl8821ae_clear_interrupt(struct ieee80211_hw *hw)
++{
++	struct rtl_priv *rtlpriv = rtl_priv(hw);
++	u32 tmp = rtl_read_dword(rtlpriv, REG_HISR);
++
++	rtl_write_dword(rtlpriv, REG_HISR, tmp);
++
++	tmp = rtl_read_dword(rtlpriv, REG_HISRE);
++	rtl_write_dword(rtlpriv, REG_HISRE, tmp);
++
++	tmp = rtl_read_dword(rtlpriv, REG_HSISR);
++	rtl_write_dword(rtlpriv, REG_HSISR, tmp);
++}
++
+ void rtl8821ae_enable_interrupt(struct ieee80211_hw *hw)
+ {
+ 	struct rtl_priv *rtlpriv = rtl_priv(hw);
+ 	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+ 
++	if (!rtlpci->int_clear)
++		rtl8821ae_clear_interrupt(hw);/*clear it here first*/
++
+ 	rtl_write_dword(rtlpriv, REG_HIMR, rtlpci->irq_mask[0] & 0xFFFFFFFF);
+ 	rtl_write_dword(rtlpriv, REG_HIMRE, rtlpci->irq_mask[1] & 0xFFFFFFFF);
+ 	rtlpci->irq_enabled = true;
+diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/sw.c b/drivers/net/wireless/rtlwifi/rtl8821ae/sw.c
+index a4988121..8ee141a 100644
+--- a/drivers/net/wireless/rtlwifi/rtl8821ae/sw.c
++++ b/drivers/net/wireless/rtlwifi/rtl8821ae/sw.c
+@@ -96,6 +96,7 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw)
+ 
+ 	rtl8821ae_bt_reg_init(hw);
+ 	rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support;
++	rtlpci->int_clear = rtlpriv->cfg->mod_params->int_clear;
+ 	rtlpriv->btcoexist.btc_ops = rtl_btc_get_ops_pointer();
+ 
+ 	rtlpriv->dm.dm_initialgain_enable = 1;
+@@ -167,6 +168,7 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw)
+ 	rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps;
+ 	rtlpriv->psc.fwctrl_lps = rtlpriv->cfg->mod_params->fwctrl_lps;
+ 	rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support;
++	rtlpci->msi_support = rtlpriv->cfg->mod_params->int_clear;
+ 	if (rtlpriv->cfg->mod_params->disable_watchdog)
+ 		pr_info("watchdog disabled\n");
+ 	rtlpriv->psc.reg_fwctrl_lps = 3;
+@@ -308,6 +310,7 @@ static struct rtl_mod_params rtl8821ae_mod_params = {
+ 	.swctrl_lps = false,
+ 	.fwctrl_lps = true,
+ 	.msi_support = true,
++	.int_clear = true,
+ 	.debug = DBG_EMERG,
+ 	.disable_watchdog = 0,
+ };
+@@ -437,6 +440,7 @@ module_param_named(fwlps, rtl8821ae_mod_params.fwctrl_lps, bool, 0444);
+ module_param_named(msi, rtl8821ae_mod_params.msi_support, bool, 0444);
+ module_param_named(disable_watchdog, rtl8821ae_mod_params.disable_watchdog,
+ 		   bool, 0444);
++module_param_named(int_clear, rtl8821ae_mod_params.int_clear, bool, 0444);
+ MODULE_PARM_DESC(swenc, "Set to 1 for software crypto (default 0)\n");
+ MODULE_PARM_DESC(ips, "Set to 0 to not use link power save (default 1)\n");
+ MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 0)\n");
+@@ -444,6 +448,7 @@ MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");
+ MODULE_PARM_DESC(msi, "Set to 1 to use MSI interrupts mode (default 1)\n");
+ MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
+ MODULE_PARM_DESC(disable_watchdog, "Set to 1 to disable the watchdog (default 0)\n");
++MODULE_PARM_DESC(int_clear, "Set to 1 to disable interrupt clear before set (default 0)\n");
+ 
+ static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
+ 
+diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
+index b90ca61..4544752 100644
+--- a/drivers/net/wireless/rtlwifi/wifi.h
++++ b/drivers/net/wireless/rtlwifi/wifi.h
+@@ -2249,6 +2249,9 @@ struct rtl_mod_params {
+ 
+ 	/* default 0: 1 means disable */
+ 	bool disable_watchdog;
++
++	/* default 0: 1 means do not disable interrupts */
++	bool int_clear;
+ };
+ 
+ struct rtl_hal_usbint_cfg {
+-- 
+2.1.4
+

kernel/kernel/files/patches/mageia/pci-acs-quirks-for-Intel-9-series-PCH-root-ports.patch

@@ -1,28 +0,0 @@
-From: Alex Williamson <alex.williamson@redhat.com>
-Subject: [PATCH] PCI: ACS quirks for Intel 9-series PCH root ports
-Date: Fri, 01 May 2015 13:20:13 -0600
-
-Intel confirms that 9-series chipset root ports provide ACS-equivalent
-isolation when configured via the existing Intel PCH ACS quirk setup.
-
-Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
-Acked-by: Don Dugger <donald.d.dugger@intel.com>
-
----
- drivers/pci/quirks.c |    2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index c6dc1df..f126bd6 100644
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -3740,6 +3740,8 @@ static const u16 pci_quirk_intel_pch_acs_ids[] = {
- 	/* Wellsburg (X99) PCH */
- 	0x8d10, 0x8d11, 0x8d12, 0x8d13, 0x8d14, 0x8d15, 0x8d16, 0x8d17,
- 	0x8d18, 0x8d19, 0x8d1a, 0x8d1b, 0x8d1c, 0x8d1d, 0x8d1e,
-+	/* Lynx Point (9 series) PCH */
-+	0x8c90, 0x8c92, 0x8c94, 0x8c96, 0x8c98, 0x8c9a, 0x8c9c, 0x8c9e,
- };
- 
- static bool pci_quirk_intel_pch_acs_match(struct pci_dev *dev)
-

kernel/kernel/files/patches/mageia/platform-x86-shuttle-wmi-4.2-buildfix.patch

@@ -0,0 +1,19 @@
+--- linux/drivers/platform/x86/shuttle-wmi.c.orig	2015-09-30 00:51:13.000000000 +0300
++++ linux/drivers/platform/x86/shuttle-wmi.c	2015-09-30 02:04:20.808458393 +0300
+@@ -26,6 +26,7 @@
+ #include <linux/input/sparse-keymap.h>
+ #include <linux/backlight.h>
+ #include <linux/fb.h>
++#include <acpi/video.h>
+ 
+ MODULE_AUTHOR("Herton Ronaldo Krzesinski");
+ MODULE_DESCRIPTION("Shuttle WMI Extras Driver");
+@@ -1161,7 +1162,7 @@ static int shuttle_wmi_probe(struct plat
+ 		goto err_notify;
+ 	}
+ 
+-	if (!acpi_video_backlight_support()) {
++	if (acpi_video_get_backlight_type() == acpi_backlight_vendor) {
+ 		rc = shuttle_wmi_backlight_init(priv);
+ 		if (rc)
+ 			goto err_backlight;

kernel/kernel/files/patches/mageia/scsi-Fix-NULL-pointer-dereference-in-RTPM-of-block-layer.patch

@@ -0,0 +1,74 @@
+SCSI: Fix NULL pointer dereference in RTPM of block layer
+
+The routines in scsi_pm.c assume that if a runtime-PM callback is
+invoked for a SCSI device, it can only mean that the device's driver
+has asked the block layer to handle the runtime power management (by
+calling blk_pm_runtime_init(), which among other things sets q->dev).
+
+However, this assumption turns out to be wrong for things like the ses
+driver.  Normally ses devices are not allowed to do runtime PM, but
+userspace can override this setting.  If this happens, the kernel gets
+a NULL pointer dereference when blk_post_runtime_resume() tries to use
+the uninitialized q->dev pointer.
+
+This patch fixes the problem by checking q->dev in block layer before
+handle runtime PM. Since ses doesn't define any PM callbacks and call
+blk_pm_runtime_init(), the crash won't occur.
+
+This fixes Bugzilla #101371.
+https://bugzilla.kernel.org/show_bug.cgi?id=101371
+
+Signed-off-by: Ken Xue <Ken.Xue@amd.com>
+Acked-by: Alan Stern <stern@rowland.harvard.edu>
+Cc: stable@vger.kernel.org
+
+---
+ block/blk-core.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/block/blk-core.c b/block/blk-core.c
+index 60912e9..a07ab18 100644
+--- a/block/blk-core.c
++++ b/block/blk-core.c
+@@ -3280,6 +3280,9 @@ int blk_pre_runtime_suspend(struct request_queue *q)
+ {
+ 	int ret = 0;
+ 
++	if (!q->dev)
++		return ret;
++
+ 	spin_lock_irq(q->queue_lock);
+ 	if (q->nr_pending) {
+ 		ret = -EBUSY;
+@@ -3307,6 +3310,9 @@ EXPORT_SYMBOL(blk_pre_runtime_suspend);
+  */
+ void blk_post_runtime_suspend(struct request_queue *q, int err)
+ {
++	if (!q->dev)
++		return;
++
+ 	spin_lock_irq(q->queue_lock);
+ 	if (!err) {
+ 		q->rpm_status = RPM_SUSPENDED;
+@@ -3331,6 +3337,9 @@ EXPORT_SYMBOL(blk_post_runtime_suspend);
+  */
+ void blk_pre_runtime_resume(struct request_queue *q)
+ {
++	if (!q->dev)
++		return;
++
+ 	spin_lock_irq(q->queue_lock);
+ 	q->rpm_status = RPM_RESUMING;
+ 	spin_unlock_irq(q->queue_lock);
+@@ -3353,6 +3362,9 @@ EXPORT_SYMBOL(blk_pre_runtime_resume);
+  */
+ void blk_post_runtime_resume(struct request_queue *q, int err)
+ {
++	if (!q->dev)
++		return;
++
+ 	spin_lock_irq(q->queue_lock);
+ 	if (!err) {
+ 		q->rpm_status = RPM_ACTIVE;
+-- 
+1.9.1

kernel/kernel/files/patches/mageia/scsi-Revert-SCSI-Fix-NULL-pointer-dereference-in-runtime-PM.patch

@@ -0,0 +1,64 @@
+Revert "SCSI: Fix NULL pointer dereference in runtime PM"
+
+This reverts commit 49718f0fb8c9 ("SCSI: Fix NULL pointer dereference in
+runtime PM")
+
+The old commit may lead to a issue that blk_{pre|post}_runtime_suspend and
+blk_{pre|post}_runtime_resume can not be called in pairs.
+
+Take sr device as example, when sr device goes to runtime suspend, 
+blk_{pre|post}_runtime_suspend will be called since sr device defined
+pm->runtime_suspend. But blk_{pre|post}_runtime_resume will not be called
+since sr device doesn't have pm->runtime_resume. Then sr device can not
+resume correctly anymore.
+
+Signed-off-by: Ken Xue <Ken.Xue@amd.com>
+Acked-by: Alan Stern <stern@rowland.harvard.edu>
+Cc: stable@vger.kernel.org
+
+---
+ drivers/scsi/scsi_pm.c | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c
+index e4b7998..459abe1 100644
+--- a/drivers/scsi/scsi_pm.c
++++ b/drivers/scsi/scsi_pm.c
+@@ -219,13 +219,13 @@ static int sdev_runtime_suspend(struct device *dev)
+ 	struct scsi_device *sdev = to_scsi_device(dev);
+ 	int err = 0;
+ 
+-	if (pm && pm->runtime_suspend) {
+-		err = blk_pre_runtime_suspend(sdev->request_queue);
+-		if (err)
+-			return err;
++	err = blk_pre_runtime_suspend(sdev->request_queue);
++	if (err)
++		return err;
++	if (pm && pm->runtime_suspend)
+ 		err = pm->runtime_suspend(dev);
+-		blk_post_runtime_suspend(sdev->request_queue, err);
+-	}
++	blk_post_runtime_suspend(sdev->request_queue, err);
++
+ 	return err;
+ }
+ 
+@@ -248,11 +248,11 @@ static int sdev_runtime_resume(struct device *dev)
+ 	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
+ 	int err = 0;
+ 
+-	if (pm && pm->runtime_resume) {
+-		blk_pre_runtime_resume(sdev->request_queue);
++	blk_pre_runtime_resume(sdev->request_queue);
++	if (pm && pm->runtime_resume)
+ 		err = pm->runtime_resume(dev);
+-		blk_post_runtime_resume(sdev->request_queue, err);
+-	}
++	blk_post_runtime_resume(sdev->request_queue, err);
++
+ 	return err;
+ }
+ 
+-- 
+1.9.1

kernel/kernel/files/patches/mageia/series

@@ -14,6 +14,9 @@
 ###
 ### Stable Queue
 ###
+stable-mac80211-fix-hwflags-debugfs-file-format.patch
+stable-ath9k-declare-required-extra-tx-headroom.patch
+stable-mmc-core-fix-init_card-in-52mhz.patch
 
 ###
 ### Arch x86
@@ -38,9 +41,13 @@ x86-increase-default-minimum-vmalloc-area-by-64MB-to-192MB.patch
 # slows down boot
 Revert-cpufreq-pcc-Enable-autoload-of-pcc-cpufreq-fo.patch
 
+# EFI
+x86-efi-Fix-multiple-GOP-device-support.patch
+
 ###
 ### Core
 ###
+base-cacheinfo-silence-DT-warnings.patch
 
 ###
 ### i2c
@@ -56,9 +63,6 @@ Revert-cpufreq-pcc-Enable-autoload-of-pcc-cpufreq-fo.patch
 pci-add-ALI-M5229-ide-compatibility-mode-quirk.patch
 pci-quirks-drop-devinit-exit.patch
 
-# Intel ACS quirks
-pci-acs-quirks-for-Intel-9-series-PCH-root-ports.patch
-
 ###
 ### PNP core
 ###
@@ -112,13 +116,12 @@ block-floppy-disable-pnp-modalias.patch
 # prefer ata over ide drivers
 ata-prefer-ata-drivers-over-ide-drivers-when-both-are-built.patch
 
-# korg #81551
-ata-revert-Disabling-the-async-PM-for-JMicron-chip-363-361.patch
-ata-jmicron-disable-broken-async_suspend.patch
-
 # Nice SSD speedup
 block-Make-CFQ-default-to-IOPS-mode-on-SSDs.patch
-block-cfq-iosched-fix-the-setting-of-IOPS-mode-on-SSDs.patch
+
+# properly fix null pointer deref introduced in 4.1.7
+scsi-Revert-SCSI-Fix-NULL-pointer-dereference-in-runtime-PM.patch
+scsi-Fix-NULL-pointer-dereference-in-RTPM-of-block-layer.patch
 
 ###
 ### File-system
@@ -128,6 +131,9 @@ block-cfq-iosched-fix-the-setting-of-IOPS-mode-on-SSDs.patch
 fs-aufs4.patch
 fs-aufs4-modular.patch
 
+# btrfs memleak
+fs-btrfs-fix-possible-leak-in-btrfs_ioctl_balance.patch
+
 ###
 ### FireWire
 ###
@@ -171,6 +177,9 @@ gpu-drm-mach64-3.18-buildfix.patch
 
 input-i8042-quirks-for-Fujitsu-Lifebook-A544-and-Lif.patch
 
+# fix alps breakage
+input-alps-Only-the-Dell-Latitude-D420_430_620_630-have-separate-stick-button-bits.patch
+
 ###
 ### idle
 ###
@@ -183,8 +192,6 @@ input-i8042-quirks-for-Fujitsu-Lifebook-A544-and-Lif.patch
 ### Media
 ###
 
-media-Fix-regression-in-some-more-dib0700-based-devi.patch
-
 ###
 ### Misc
 ###
@@ -213,6 +220,12 @@ net-netfilter-psd.patch
 net-netfilter-psd-mdv.patch
 net-netfilter-psd-2.6.35-buildfix.patch
 
+# wireless lockup
+net-wireless-rtlwifi-rtl8821ae-Fix-system-lockups-on-boot.patch
+
+# iwlwifi borked fw reference
+net-wireless-iwlwifi-fix-firmware-filename-for-3160.patch
+
 ###
 ### Platform drivers
 ###
@@ -221,6 +234,7 @@ net-netfilter-psd-2.6.35-buildfix.patch
 # (Mainly allow turning on/off webcam and wireless on Shuttle DA18IE and DA18IM)
 platform-x86-add-shuttle-wmi-driver.patch
 platform-x86-shuttle-wmi-drop-devinit-exit.patch
+platform-x86-shuttle-wmi-4.2-buildfix.patch
 
 ###
 ### RTC
@@ -246,6 +260,10 @@ include-kbuild-export-pci_ids.patch
 ### TTY
 ###
 
+###
+### Thunderbolt
+thunderbolt-Allow-loading-of-module-on-recent-Apple-.patch
+
 ###
 ### USB
 ###
@@ -298,6 +316,7 @@ video-mageia-logo.patch
 3rd-ndiswrapper-Makefile-build-fix.patch
 3rd-ndiswrapper-linux-3.14-buildfix.patch
 3rd-ndiswrapper-4.0-buildfix.patch
+3rd-ndiswrapper-4.2-buildfix.patch
 
 # rfswitch
 3rd-rfswitch-1.3.patch
@@ -315,6 +334,7 @@ video-mageia-logo.patch
 3rd-rtl8723bs.patch
 3rd-rtl8723bs-buildfix.patch
 3rd-rtl8723bs-updates.patch
+3rd-rtl8723bs-4.2-buildfix.patch
 
 ###
 ### Security

kernel/kernel/files/patches/mageia/stable-ath9k-declare-required-extra-tx-headroom.patch

@@ -0,0 +1,31 @@
+From 029cd0370241641eb70235d205aa0b90c84dce44 Mon Sep 17 00:00:00 2001
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Thu, 24 Sep 2015 16:59:46 +0200
+Subject: ath9k: declare required extra tx headroom
+
+From: Felix Fietkau <nbd@openwrt.org>
+
+commit 029cd0370241641eb70235d205aa0b90c84dce44 upstream.
+
+ath9k inserts padding between the 802.11 header and the data area (to
+align it). Since it didn't declare this extra required headroom, this
+led to some nasty issues like randomly dropped packets in some setups.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/ath/ath9k/init.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -874,6 +874,7 @@ static void ath9k_set_hw_capab(struct at
+ 	hw->max_rate_tries = 10;
+ 	hw->sta_data_size = sizeof(struct ath_node);
+ 	hw->vif_data_size = sizeof(struct ath_vif);
++	hw->extra_tx_headroom = 4;
+ 
+ 	hw->wiphy->available_antennas_rx = BIT(ah->caps.max_rxchains) - 1;
+ 	hw->wiphy->available_antennas_tx = BIT(ah->caps.max_txchains) - 1;

kernel/kernel/files/patches/mageia/stable-mac80211-fix-hwflags-debugfs-file-format.patch

@@ -0,0 +1,34 @@
+From 4633dfc32c0019bed2996de9bbdbe7f3b518a44e Mon Sep 17 00:00:00 2001
+From: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>
+Date: Thu, 8 Oct 2015 19:20:14 +0530
+Subject: mac80211: Fix hwflags debugfs file format
+
+From: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>
+
+commit 4633dfc32c0019bed2996de9bbdbe7f3b518a44e upstream.
+
+Commit 30686bf7f5b3 ("mac80211: convert HW flags to unsigned long
+bitmap") accidentally removed the newline delimiter from the hwflags
+debugfs file. Fix this by adding back the newline between the HW flags.
+
+Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>
+[fix commit log]
+Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/mac80211/debugfs.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/mac80211/debugfs.c
++++ b/net/mac80211/debugfs.c
+@@ -148,7 +148,7 @@ static ssize_t hwflags_read(struct file
+ 
+ 	for (i = 0; i < NUM_IEEE80211_HW_FLAGS; i++) {
+ 		if (test_bit(i, local->hw.flags))
+-			pos += scnprintf(pos, end - pos, "%s",
++			pos += scnprintf(pos, end - pos, "%s\n",
+ 					 hw_flag_names[i]);
+ 	}
+ 

kernel/kernel/files/patches/mageia/stable-mmc-core-fix-init_card-in-52mhz.patch

@@ -0,0 +1,82 @@
+From 08b137d90eec51b0e90c42e123ca8ceb118d233f Mon Sep 17 00:00:00 2001
+From: Chaotian Jing <chaotian.jing@mediatek.com>
+Date: Mon, 12 Oct 2015 17:22:23 +0800
+Subject: mmc: core: Fix init_card in 52Mhz
+
+From: Chaotian Jing <chaotian.jing@mediatek.com>
+
+commit 08b137d90eec51b0e90c42e123ca8ceb118d233f upstream.
+
+Suppose that we got a data crc error, and it triggers the mmc_reset.
+mmc_reset will call mmc_send_status to see if HW reset was supported.
+before issue CMD13, it will do retune, and if EMMC was in HS400 mode,
+it will reduce frequency to 52Mhz firstly, then results in card init
+was doing at 52Mhz.
+The mmc_send_status was originally only done for mmc_test, should drop
+it. And, rename the "eMMC hardware reset" to "Reset test", as we would
+also be able to use the test for SD-cards.
+
+Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com>
+Suggested-by: Adrian Hunter <adrian.hunter@intel.com>
+Fixes: bd11e8bd03ca ("mmc: core: Flag re-tuning is needed on CRC errors")
+Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/mmc/card/mmc_test.c |    9 +++------
+ drivers/mmc/core/mmc.c      |    7 -------
+ 2 files changed, 3 insertions(+), 13 deletions(-)
+
+--- a/drivers/mmc/card/mmc_test.c
++++ b/drivers/mmc/card/mmc_test.c
+@@ -2263,15 +2263,12 @@ static int mmc_test_profile_sglen_r_nonb
+ /*
+  * eMMC hardware reset.
+  */
+-static int mmc_test_hw_reset(struct mmc_test_card *test)
++static int mmc_test_reset(struct mmc_test_card *test)
+ {
+ 	struct mmc_card *card = test->card;
+ 	struct mmc_host *host = card->host;
+ 	int err;
+ 
+-	if (!mmc_card_mmc(card) || !mmc_can_reset(card))
+-		return RESULT_UNSUP_CARD;
+-
+ 	err = mmc_hw_reset(host);
+ 	if (!err)
+ 		return RESULT_OK;
+@@ -2605,8 +2602,8 @@ static const struct mmc_test_case mmc_te
+ 	},
+ 
+ 	{
+-		.name = "eMMC hardware reset",
+-		.run = mmc_test_hw_reset,
++		.name = "Reset test",
++		.run = mmc_test_reset,
+ 	},
+ };
+ 
+--- a/drivers/mmc/core/mmc.c
++++ b/drivers/mmc/core/mmc.c
+@@ -1924,7 +1924,6 @@ EXPORT_SYMBOL(mmc_can_reset);
+ static int mmc_reset(struct mmc_host *host)
+ {
+ 	struct mmc_card *card = host->card;
+-	u32 status;
+ 
+ 	if (!(host->caps & MMC_CAP_HW_RESET) || !host->ops->hw_reset)
+ 		return -EOPNOTSUPP;
+@@ -1937,12 +1936,6 @@ static int mmc_reset(struct mmc_host *ho
+ 
+ 	host->ops->hw_reset(host);
+ 
+-	/* If the reset has happened, then a status command will fail */
+-	if (!mmc_send_status(card, &status)) {
+-		mmc_host_clk_release(host);
+-		return -ENOSYS;
+-	}
+-
+ 	/* Set initial state and call mmc_set_ios */
+ 	mmc_set_initial_state(host);
+ 	mmc_host_clk_release(host);

kernel/kernel/files/patches/mageia/thunderbolt-Allow-loading-of-module-on-recent-Apple-.patch

@@ -0,0 +1,45 @@
+From a42fb351ca1f340f8307468be765e3f77ddedda9 Mon Sep 17 00:00:00 2001
+From: Knuth Posern <knuth@posern.org>
+Date: Sun, 20 Sep 2015 21:25:22 +0200
+Subject: [PATCH] thunderbolt: Allow loading of module on recent Apple MacBooks
+ with thunderbolt 2 controller
+
+The pci device ids listed in the thunderbolt driver are to restrictive,
+which prevents the driver from being loaded on recent Apple MacBooks
+using a thunderbolt 2 controller. In particular this prevented any
+hot-plugging functionality for thunderbolt based ethernet dongles
+(i.e. Apples thunderbolt gigabit ethernet broadcom tg3 based dongle
+Model A1433 EMC 2590).
+
+Changing the subvendor and subdevice to PCI_ANY_ID the thunderbolt driver
+loads and binds to the pci device 07:00.0 System peripheral:
+Intel Corporation Device 156c which is the thunderbolt 2 controller on
+the MacBookPro12,1.
+
+Successfully tested on MacBookPro12,1. With the patch the thunderbolt
+module gets now loaded on boot. And it provides hot-plugging support both
+for a cold-plugged and a warm-plugged ethernet dongle.
+
+Signed-off-by: Andreas Noever <andreas.noever@gmail.com>
+Acked-by: Knuth Posern <knuth@posern.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/thunderbolt/nhi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c
+index c68fe12..20a41f7 100644
+--- a/drivers/thunderbolt/nhi.c
++++ b/drivers/thunderbolt/nhi.c
+@@ -643,7 +643,7 @@ static struct pci_device_id nhi_ids[] = {
+ 	{
+ 		.class = PCI_CLASS_SYSTEM_OTHER << 8, .class_mask = ~0,
+ 		.vendor = PCI_VENDOR_ID_INTEL, .device = 0x156c,
+-		.subvendor = 0x2222, .subdevice = 0x1111,
++		.subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID,
+ 	},
+ 	{ 0,}
+ };
+-- 
+2.6.0
+

kernel/kernel/files/patches/mageia/x86-efi-Fix-multiple-GOP-device-support.patch

@@ -0,0 +1,92 @@
+From 8a53554e12e98d1759205afd7b8e9e2ea0936f48 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=
+ <dirty.ice.hu@gmail.com>
+Date: Mon, 12 Oct 2015 15:13:56 +0100
+Subject: [PATCH] x86/efi: Fix multiple GOP device support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When multiple GOP devices exists, but none of them implements
+ConOut, the code should just choose the first GOP (according to
+the comments). But currently 'fb_base' will refer to the last GOP,
+while other parameters to the first GOP, which will likely
+result in a garbled display.
+
+I can reliably reproduce this bug using my ASRock Z87M Extreme4
+motherboard with CSM and integrated GPU disabled, and two PCIe
+video cards (NVidia GT640 and GTX980), booting from efi-stub
+(booting from grub works fine).  On the primary display the
+ASRock logo remains and on the secondary screen it is garbled
+up completely.
+
+Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu@gmail.com>
+Signed-off-by: Matt Fleming <matt.fleming@intel.com>
+Cc: <stable@vger.kernel.org>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Matthew Garrett <mjg59@srcf.ucam.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Link: http://lkml.kernel.org/r/1444659236-24837-2-git-send-email-matt@codeblueprint.co.uk
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+---
+ arch/x86/boot/compressed/eboot.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
+index ee1b6d3..db51c1f 100644
+--- a/arch/x86/boot/compressed/eboot.c
++++ b/arch/x86/boot/compressed/eboot.c
+@@ -667,6 +667,7 @@ setup_gop32(struct screen_info *si, efi_guid_t *proto,
+ 		bool conout_found = false;
+ 		void *dummy = NULL;
+ 		u32 h = handles[i];
++		u32 current_fb_base;
+ 
+ 		status = efi_call_early(handle_protocol, h,
+ 					proto, (void **)&gop32);
+@@ -678,7 +679,7 @@ setup_gop32(struct screen_info *si, efi_guid_t *proto,
+ 		if (status == EFI_SUCCESS)
+ 			conout_found = true;
+ 
+-		status = __gop_query32(gop32, &info, &size, &fb_base);
++		status = __gop_query32(gop32, &info, &size, &current_fb_base);
+ 		if (status == EFI_SUCCESS && (!first_gop || conout_found)) {
+ 			/*
+ 			 * Systems that use the UEFI Console Splitter may
+@@ -692,6 +693,7 @@ setup_gop32(struct screen_info *si, efi_guid_t *proto,
+ 			pixel_format = info->pixel_format;
+ 			pixel_info = info->pixel_information;
+ 			pixels_per_scan_line = info->pixels_per_scan_line;
++			fb_base = current_fb_base;
+ 
+ 			/*
+ 			 * Once we've found a GOP supporting ConOut,
+@@ -770,6 +772,7 @@ setup_gop64(struct screen_info *si, efi_guid_t *proto,
+ 		bool conout_found = false;
+ 		void *dummy = NULL;
+ 		u64 h = handles[i];
++		u32 current_fb_base;
+ 
+ 		status = efi_call_early(handle_protocol, h,
+ 					proto, (void **)&gop64);
+@@ -781,7 +784,7 @@ setup_gop64(struct screen_info *si, efi_guid_t *proto,
+ 		if (status == EFI_SUCCESS)
+ 			conout_found = true;
+ 
+-		status = __gop_query64(gop64, &info, &size, &fb_base);
++		status = __gop_query64(gop64, &info, &size, &current_fb_base);
+ 		if (status == EFI_SUCCESS && (!first_gop || conout_found)) {
+ 			/*
+ 			 * Systems that use the UEFI Console Splitter may
+@@ -795,6 +798,7 @@ setup_gop64(struct screen_info *si, efi_guid_t *proto,
+ 			pixel_format = info->pixel_format;
+ 			pixel_info = info->pixel_information;
+ 			pixels_per_scan_line = info->pixels_per_scan_line;
++			fb_base = current_fb_base;
+ 
+ 			/*
+ 			 * Once we've found a GOP supporting ConOut,
+-- 
+2.6.2
+

kernel/kernel/pspec.xml

@@ -1,4 +1,4 @@
-i<?xml version="1.0" ?>
+<?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
@@ -12,7 +12,7 @@ i<?xml version="1.0" ?>
         <IsA>kernel</IsA>
         <Summary>The Linux kernel (the core of the Linux operating system) for Pisi Linux</Summary>
         <Description>kernel contains the Linux kernel, the core of any Linux operating system. The kernel handles the basic functions of the operating system: memory allocation, process allocation, device input and output, etc.</Description>
-        <Archive sha1sum="dce24ac1874f362000e40027075e7d24ba123b73" type="targz">https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.tar.gz</Archive>
+        <Archive sha1sum="70db3c22960e3da16b7d7b0a55066154b8d92900" type="targz">https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.2.tar.gz</Archive>
         <AdditionalFiles>
             <AdditionalFile target="configs/kernel-i686-config">configs/kernel-i686-config</AdditionalFile>
             <AdditionalFile target="configs/kernel-x86_64-config">configs/kernel-x86_64-config</AdditionalFile>
@@ -28,16 +28,22 @@ i<?xml version="1.0" ?>
         </BuildDependencies>
         <Patches>
             <!-- Linux patches -->
-            <Patch level="1" compressionType="xz">patches/linux/patch-4.1.3.xz</Patch>
-            <!-- Mageia Linux patches // compatible with http://svnweb.mageia.org/packages/cauldron/kernel/releases/4.1.3/1.mga6/PATCHES/patches/series-->
+            <Patch level="1" compressionType="xz">patches/linux/patch-4.2.5.xz</Patch>
+            <!-- Mageia Linux patches // compatible with http://svnweb.mageia.org/packages/cauldron/kernel/releases/4.2.5/1.mga6/PATCHES/patches/series-->
+            <!--stable patches-->
+            <Patch level="1">patches/mageia/stable-mac80211-fix-hwflags-debugfs-file-format.patch</Patch>
+            <Patch level="1">patches/mageia/stable-ath9k-declare-required-extra-tx-headroom.patch</Patch>
+            <Patch level="1">patches/mageia/stable-mmc-core-fix-init_card-in-52mhz.patch</Patch>
+            <!--other patches-->
             <Patch level="1">patches/mageia/x86-pci-toshiba-equium-a60-assign-busses.patch</Patch>
             <Patch level="1">patches/mageia/x86-boot-video-80x25-if-break.patch</Patch>
             <Patch level="1">patches/mageia/x86-default_poweroff_up_machines.patch</Patch>
             <Patch level="1">patches/mageia/x86-increase-default-minimum-vmalloc-area-by-64MB-to-192MB.patch</Patch>
             <Patch level="1">patches/mageia/Revert-cpufreq-pcc-Enable-autoload-of-pcc-cpufreq-fo.patch</Patch>
+            <Patch level="1">patches/mageia/x86-efi-Fix-multiple-GOP-device-support.patch</Patch>
+            <Patch level="1">patches/mageia/base-cacheinfo-silence-DT-warnings.patch</Patch>
             <Patch level="1">patches/mageia/pci-add-ALI-M5229-ide-compatibility-mode-quirk.patch</Patch>
             <Patch level="1">patches/mageia/pci-quirks-drop-devinit-exit.patch</Patch>
-            <Patch level="1">patches/mageia/pci-acs-quirks-for-Intel-9-series-PCH-root-ports.patch</Patch>
             <Patch level="1">patches/mageia/acpi-CLEVO-M360S-disable_acpi_irq.patch</Patch>
             <Patch level="1">patches/mageia/acpi-processor-M720SR-limit-to-C2.patch</Patch>
             <!--Patch level="1">patches/mageia/scsi-ppscsi-2.6.2.patch</Patch>
@@ -52,12 +58,10 @@ i<?xml version="1.0" ?>
             <Patch level="1">patches/mageia/dm-raid-aliases.patch</Patch>
             <Patch level="1">patches/mageia/block-floppy-disable-pnp-modalias.patch</Patch>
             <Patch level="1">patches/mageia/ata-prefer-ata-drivers-over-ide-drivers-when-both-are-built.patch</Patch>
-            <Patch level="1">patches/mageia/ata-revert-Disabling-the-async-PM-for-JMicron-chip-363-361.patch</Patch>
-            <Patch level="1">patches/mageia/ata-jmicron-disable-broken-async_suspend.patch</Patch>
             <Patch level="1">patches/mageia/block-Make-CFQ-default-to-IOPS-mode-on-SSDs.patch</Patch>
-            <Patch level="1">patches/mageia/block-cfq-iosched-fix-the-setting-of-IOPS-mode-on-SSDs.patch</Patch>
             <Patch level="1">patches/mageia/fs-aufs4.patch</Patch>
             <Patch level="1">patches/mageia/fs-aufs4-modular.patch</Patch>
+            <Patch level="1">patches/mageia/fs-btrfs-fix-possible-leak-in-btrfs_ioctl_balance.patch</Patch><!--essai-->
             <Patch level="1">patches/mageia/firewire-ieee1394-module-aliases.patch</Patch>
             <Patch level="1">patches/mageia/char-agp-intel-new-Q57-id.patch</Patch>
             <Patch level="1">patches/mageia/gpu-drm-mach64.patch</Patch>
@@ -73,12 +77,12 @@ i<?xml version="1.0" ?>
             <Patch level="1">patches/mageia/gpu-drm-mach64-3.6-buildfix.patch</Patch>
             <Patch level="1">patches/mageia/gpu-drm-mach64-3.7-buildfix.patch</Patch>
             <Patch level="1">patches/mageia/gpu-drm-mach64-3.12-buildfix.patch</Patch>
-            <Patch level="1">patches/mageia/gpu-drm-mach64-restore-mach64_PCI_IDS.patch</Patch><!--deneme-->
+            <Patch level="1">patches/mageia/gpu-drm-mach64-restore-mach64_PCI_IDS.patch</Patch>
             <Patch level="1">patches/mageia/gpu-drm-mach64-linux-3.14-buildfix.patch</Patch>
             <Patch level="1">patches/mageia/gpu-drm-mach64-3.17-buildfix.patch</Patch>
             <Patch level="1">patches/mageia/gpu-drm-mach64-3.18-buildfix.patch</Patch>
             <Patch level="1">patches/mageia/input-i8042-quirks-for-Fujitsu-Lifebook-A544-and-Lif.patch</Patch>
-            <Patch level="1">patches/mageia/media-Fix-regression-in-some-more-dib0700-based-devi.patch</Patch>
+            <Patch level="1">patches/mageia/input-alps-Only-the-Dell-Latitude-D420_430_620_630-have-separate-stick-button-bits.patch</Patch>           
             <Patch level="1">patches/mageia/net-sis190-fix-list-usage.patch</Patch>
             <Patch level="1">patches/mageia/net-netfilter-IFWLOG.patch</Patch>
             <Patch level="1">patches/mageia/net-netfilter-IFWLOG-mdv.patch</Patch>
@@ -88,10 +92,14 @@ i<?xml version="1.0" ?>
             <Patch level="1">patches/mageia/net-netfilter-IFWLOG-3.7-buildfix.patch</Patch>
             <Patch level="1">patches/mageia/net-netfilter-psd.patch</Patch>
             <Patch level="1">patches/mageia/net-netfilter-psd-mdv.patch</Patch>
-            <Patch level="1">patches/mageia/net-netfilter-psd-2.6.35-buildfix.patch</Patch>
+            <Patch level="1">patches/mageia/net-netfilter-psd-2.6.35-buildfix.patch</Patch>            
+            <Patch level="1">patches/mageia/net-wireless-rtlwifi-rtl8821ae-Fix-system-lockups-on-boot.patch</Patch>            
+            <Patch level="1">patches/mageia/net-wireless-iwlwifi-fix-firmware-filename-for-3160.patch</Patch>            
             <Patch level="1">patches/mageia/platform-x86-add-shuttle-wmi-driver.patch</Patch>
             <Patch level="1">patches/mageia/platform-x86-shuttle-wmi-drop-devinit-exit.patch</Patch>
+            <Patch level="1">patches/mageia/platform-x86-shuttle-wmi-4.2-buildfix.patch</Patch>
             <Patch level="1">patches/mageia/include-kbuild-export-pci_ids.patch</Patch>
+            <Patch level="1">patches/mageia/thunderbolt-Allow-loading-of-module-on-recent-Apple-.patch</Patch>
             <Patch level="1">patches/mageia/hid-usbhid-IBM-BladeCenterHS20-quirk.patch</Patch>
             <Patch level="1">patches/mageia/usb-storage-unusual_devs-add-id.patch</Patch>
             <Patch level="1">patches/mageia/usb-storage-unusual_devs-add-id-2.6.37-buildfix.patch</Patch>
@@ -113,6 +121,7 @@ i<?xml version="1.0" ?>
             <Patch level="1">patches/mageia/3rd-ndiswrapper-Makefile-build-fix.patch</Patch>
             <Patch level="1">patches/mageia/3rd-ndiswrapper-linux-3.14-buildfix.patch</Patch>
             <Patch level="1">patches/mageia/3rd-ndiswrapper-4.0-buildfix.patch</Patch>
+            <Patch level="1">patches/mageia/3rd-ndiswrapper-4.2-buildfix.patch</Patch>
             <Patch level="1">patches/mageia/3rd-rfswitch-1.3.patch</Patch>
             <Patch level="1">patches/mageia/3rd-rfswitch-build-fix.patch</Patch>
             <Patch level="1">patches/mageia/3rd-rfswitch-3.0-buildfix.patch</Patch>
@@ -124,6 +133,9 @@ i<?xml version="1.0" ?>
             <Patch level="1">patches/mageia/3rd-rtl8723bs.patch</Patch>
             <Patch level="1">patches/mageia/3rd-rtl8723bs-buildfix.patch</Patch>
             <Patch level="1">patches/mageia/3rd-rtl8723bs-updates.patch</Patch>
+            <Patch level="1">patches/mageia/3rd-rtl8723bs-4.2-buildfix.patch</Patch>
+            <Patch level="1">patches/mageia/scsi-Fix-NULL-pointer-dereference-in-RTPM-of-block-layer.patch</Patch>
+            <Patch level="1">patches/mageia/scsi-Revert-SCSI-Fix-NULL-pointer-dereference-in-runtime-PM.patch</Patch>
         </Patches>
     </Source>
 
@@ -178,6 +190,70 @@ i<?xml version="1.0" ?>
     </Package>
 
     <History>
+         <Update release="65">
+            <Date>2015-11-30</Date>
+            <Version>4.2.5</Version>
+            <Comment>Version bump to 4.2.5 https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.2.5</Comment>
+            <Type package="kernel">security</Type>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+         <Update release="64">
+            <Date>2015-11-27</Date>
+            <Version>4.2.4</Version>
+            <Comment>Version bump to 4.2.4 https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.2.4</Comment>
+            <Type package="kernel">security</Type>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+         <Update release="63">
+            <Date>2015-10-04</Date>
+            <Version>4.2.3</Version>
+            <Comment>Version bump to 4.2.3 https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.2.3</Comment>
+            <Type package="kernel">security</Type>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+         <Update release="62">
+            <Date>2015-10-01</Date>
+            <Version>4.2.2</Version>
+            <Comment>Version bump to 4.2.2 https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.2.2</Comment>
+            <Type package="kernel">security</Type>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+         <Update release="61">
+            <Date>2015-09-23</Date>
+            <Version>4.1.8</Version>
+            <Comment>Version bump to 4.1.8 https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.8</Comment>
+            <Type package="kernel">security</Type>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+         <Update release="60">
+            <Date>2015-09-18</Date>
+            <Version>4.1.7</Version>
+            <Comment>Version bump to 4.1.7 https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.7</Comment>
+            <Type package="kernel">security</Type>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+         <Update release="59">
+            <Date>2015-09-05</Date>
+            <Version>4.1.6</Version>
+            <Comment>Version bump to 4.1.6 https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.6</Comment>
+            <Type package="kernel">security</Type>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+         <Update release="58">
+            <Date>2015-08-13</Date>
+            <Version>4.1.5</Version>
+            <Comment>Version bump to 4.1.5 https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5</Comment>
+            <Type package="kernel">security</Type>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
          <Update release="57">
             <Date>2015-07-23</Date>
             <Version>4.1.3</Version>

kernel/tools/cpupowertools/pspec.xml

@@ -12,13 +12,13 @@
         <IsA>app:console</IsA>
         <Summary>CPU power management tools</Summary>
         <Description>cpupowertools contains utilities to manage power management and frequency scaling policies of modern CPUs.</Description>
-         <Archive sha1sum="dce24ac1874f362000e40027075e7d24ba123b73" type="targz">https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.tar.gz</Archive>
+        <Archive sha1sum="70db3c22960e3da16b7d7b0a55066154b8d92900" type="targz">https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.2.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>pciutils-devel</Dependency>
         </BuildDependencies>
         <Patches>
         <!-- Linux patches -->
-            <Patch level="1" compressionType="xz">patches/linux/patch-4.1.3.xz</Patch>
+            <Patch level="1" compressionType="xz">patches/linux/patch-4.2.5.xz</Patch>
         </Patches>
     </Source>
 
@@ -44,14 +44,70 @@
         </Provides>-->
     </Package>
     <History>
-           <Update release="56">
+        <Update release="64">
+            <Date>2015-11-30</Date>
+            <Version>4.2.5</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+        <Update release="63">
+            <Date>2015-11-27</Date>
+            <Version>4.2.4</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+        <Update release="62">
+            <Date>2015-10-05</Date>
+            <Version>4.2.3</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+        <Update release="61">
+            <Date>2015-10-01</Date>
+            <Version>4.2.2</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+        <Update release="60">
+            <Date>2015-09-23</Date>
+            <Version>4.1.8</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+        <Update release="59">
+            <Date>2015-09-18</Date>
+            <Version>4.1.7</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+           <Update release="58">
+            <Date>2015-08-18</Date>
+            <Version>4.1.6</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+         <Update release="57">
+            <Date>2015-08-13</Date>
+            <Version>4.1.5</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+         </Update>
+         <Update release="56">
             <Date>2015-07-23</Date>
             <Version>4.1.3</Version>
             <Comment>Version bump.</Comment>
             <Name>Ertuğrul Erata</Name>
             <Email>ertugrulerata@gmail.com</Email>
-          </Update>
-          <Update release="55">
+         </Update>
+         <Update release="55">
             <Date>2015-07-20</Date>
             <Version>4.1.2</Version>
             <Comment>Version bump.</Comment>

kernel/tools/mkinitramfs/pspec.xml

@@ -20,6 +20,9 @@
         <RuntimeDependencies>
             <Dependency>disktype</Dependency>
             <Dependency>busybox</Dependency>
+            <Dependency>device-mapper-static</Dependency>
+            <Dependency>lvm2-static</Dependency>
+            <Dependency>mdadm-static</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc</Path>
@@ -42,9 +45,9 @@
 
     <History>
          <Update release="9">
-            <Date>2014-06-04</Date>
+            <Date>2015-08-18</Date>
             <Version>1.0.7</Version>
-            <Comment>Add aufs module initramfs</Comment>
+            <Comment>Add aufs module initramfs, add runtime dependencies for initrd.</Comment>
             <Name>Burak Ertürk</Name>
             <Email>burakerturk@pisilinux.org</Email>
         </Update>

multimedia/graphics/libpng/actions.py

@@ -32,4 +32,4 @@ def install():
 
     # remove la symlink, it is not detected correctly
     pisitools.remove("/usr/lib/libpng.la")
-    pisitools.dodoc("ANNOUNCE", "CHANGES", "README", "TODO")
+    pisitools.dodoc("ANNOUNCE", "CHANGES", "README", "TODO")

multimedia/graphics/libpng/pspec.xml

@@ -12,12 +12,12 @@
         <IsA>library</IsA>
         <Summary>Portable Network Graphics library</Summary>
         <Description>The Portable Network Graphics (PNG) format was designed to replace the older and simpler GIF format and, to some extent, the much more complex TIFF format. Project's main aim is to concentrate on two major uses: the World Wide Web (WWW) and image-editing.</Description>
-        <Archive sha1sum="31855a8438ae795d249574b0da15b34eb0922e13" type="tarxz">mirrors://sourceforge/libpng/libpng-1.6.16.tar.xz</Archive>
+        <Archive sha1sum="c6e06510d30beba08c96c468ab269fafb2bb256f" type="tarxz">mirrors://sourceforge/libpng/libpng-1.6.18.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>zlib-devel</Dependency>
         </BuildDependencies>
         <Patches>
-            <Patch level="1" compressionType="gz">libpng-1.6.15-apng.patch.gz</Patch>
+            <Patch level="1" compressionType="gz">libpng-1.6.18-apng.patch.gz</Patch>
             <Patch level="1">libpng-multilib.patch</Patch>
         </Patches>
     </Source>
@@ -66,6 +66,13 @@
     </Package>
 
     <History>
+        <Update release="9">
+            <Date>2015-08-20</Date>
+            <Version>1.6.18</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Osman Erkan</Name>
+            <Email>osman.erkan@pisilinux.org</Email>
+        </Update>
         <Update release="8">
             <Date>2015-07-14</Date>
             <Version>1.6.16</Version>

multimedia/graphics/libpng/translations.xml

@@ -16,4 +16,4 @@
         <Name>libpng-32bit</Name>
         <Summary xml:lang="tr">libpng için 32-bit paylaşımlı kitaplıklar</Summary>
     </Package>
-</PISI>
+</PISI>

pisi-index.xml.sha1sum

@@ -1 +1 @@
-31829365067e9d3eb9fa5d1b6a3989f721f37a1d
+52a21e4705a09e2594275c19666d00a4d710e3d3

pisi-index.xml.xz.sha1sum

@@ -1 +1 @@
-1990d223b2bceb3dffe4d9739846b6b1f874f50e
+5ccccdfa9f87f63bd6604b5167ba08d57299ade0

system/base/baselayout/files/pisilinux-release

@@ -1 +1 @@
-Pisi_Linux 1.2
+Pisi_Linux 2.0Alfa6

system/base/baselayout/pspec.xml

@@ -67,8 +67,15 @@
     </Package>
 
     <History>
+        <Update release="15">
+            <Date>2015-10-30</Date>
+            <Version>3.10.0</Version>
+            <Comment>Release Alfa6.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="14">
-            <Date>2015-03-04</Date>
+            <Date>2015-08-18</Date>
             <Version>3.10.0</Version>
             <Comment>Release bump</Comment>
             <Name>Yusuf Aydemir</Name>

system/base/coreutils/pspec.xml

@@ -12,7 +12,7 @@
         <IsA>app:console</IsA>
         <Summary>A set of basic GNU tools commonly used in shell scripts</Summary>
         <Description>Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)</Description>
-        <Archive sha1sum="adead02839225218b85133fa57b4dba02af2291d" type="tarxz">http://ftp.gnu.org/gnu/coreutils/coreutils-8.23.tar.xz</Archive>
+        <Archive sha1sum="cf3d9983461c2b0c074a76804c18464e9a474883" type="tarxz">http://ftp.gnu.org/gnu/coreutils/coreutils-8.24.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>acl-devel</Dependency>
             <Dependency>attr-devel</Dependency>
@@ -20,6 +20,8 @@
             <Dependency>shadow</Dependency>
             <Dependency>gettext-devel</Dependency>
             <Dependency>ncurses-devel</Dependency>
+            <Dependency>gmp-devel</Dependency>
+            <Dependency>libcap-devel</Dependency>
             <Dependency>texinfo</Dependency>
         </BuildDependencies>
         <Patches>
@@ -53,6 +55,13 @@
     </Package>
 
     <History>
+        <Update release="8">
+            <Date>2015-08-25</Date>
+            <Version>8.24</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="7">
             <Date>2015-04-01</Date>
             <Version>8.23</Version>

system/base/dbus/comar/package.py

@@ -2,7 +2,7 @@
 
 import os, re
 
-OUR_ID = 650
+OUR_ID = 101
 OUR_NAME = "dbus"
 OUR_DESC = "dbus"
 

system/base/dbus/pspec.xml

@@ -13,7 +13,7 @@
         <IsA>service</IsA>
         <Summary>A message bus system, a simple way for applications to talk to each other</Summary>
         <Description>D-Bus supplies both a system daemon (for events such as "new hardware device added" or "printer queue changed") and a per-user-login-session daemon (for general IPC needs among user applications). Also, the message bus is built on top of a general one-to-one message passing framework, which can be used by any two apps to communicate directly (without going through the message bus daemon). Currently the communicating applications are on one computer, but TCP/IP option is available and remote support planned.</Description>
-        <Archive sha1sum="9e95dfa2fa05c6028a9bc7d76a151b59411711e9" type="targz">http://dbus.freedesktop.org/releases/dbus/dbus-1.9.14.tar.gz</Archive>
+        <Archive sha1sum="eec3c798633f623e960eb1d9f93b47648f389443" type="targz">http://dbus.freedesktop.org/releases/dbus/dbus-1.10.0.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>expat-devel</Dependency>
             <Dependency>libX11-devel</Dependency>
@@ -30,7 +30,6 @@
             <Dependency>libcap-ng</Dependency>
             <!--libX11 dbus-x11 paketi ayrılınca buradan silinecek-->
             <!--<Dependency>libX11</Dependency>-->
-            <!--<Dependency>systemd-units</Dependency>-->
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc/dbus-1</Path>
@@ -59,7 +58,6 @@
         <RuntimeDependencies>
             <Dependency>libX11</Dependency>
             <Dependency>dbus</Dependency>
-            <!--<Dependency>systemd-units</Dependency>-->
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/dbus-launch</Path>
@@ -100,6 +98,13 @@
     </Package>
 
     <History>
+        <Update release="13">
+            <Date>2015-10-09</Date>
+            <Version>1.10.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="12">
             <Date>2015-05-11</Date>
             <Version>1.9.14</Version>

system/base/file/actions.py

@@ -16,6 +16,8 @@ def setup():
     autotools.configure("--datadir=/usr/share/misc \
                          --disable-static \
                          --enable-fsect-man5")
+       
+    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
 def build():
     autotools.make()

system/base/file/pspec.xml

@@ -12,10 +12,10 @@
         <IsA>app:console</IsA>
         <Summary>Program to identify a file's format by scanning binary data for patterns</Summary>
         <Description>Program to identify a file's format by scanning binary data for patterns.</Description>
-        <Archive sha1sum="c817fb4c27f01934993ece3b013adbdc4deab67e" type="targz">ftp://ftp.astron.com/pub/file/file-5.23.tar.gz</Archive>
+        <Archive sha1sum="fea78106dd0b7a09a61714cdbe545135563e84bd" type="targz">ftp://ftp.astron.com/pub/file/file-5.25.tar.gz</Archive>
         <!-- An update to this package can easily break pisi, pay attention! -->
         <BuildDependencies>
-            <Dependency>zlib</Dependency>
+            <Dependency>zlib-devel</Dependency>
             <!-- remove python dependencies while bootstrap -->
             <Dependency>python-devel</Dependency>
         </BuildDependencies>
@@ -41,6 +41,20 @@
     </Package>
 
     <History>
+        <Update release="10">
+            <Date>2015-10-27</Date>
+            <Version>5.25</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="9">
+            <Date>2015-08-24</Date>
+            <Version>5.24</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="8">
             <Date>2015-06-17</Date>
             <Version>5.23</Version>

system/base/fuse/pspec.xml

@@ -12,7 +12,7 @@
         <IsA>library</IsA>
         <Summary>An interface for filesystems implemented in userspace</Summary>
         <Description>fuse is a backend allowing regular users to (un)mount filesystems for their own use.</Description>
-        <Archive sha1sum="94bd1974a9f2173ac3c2cf122f9fa3c35996b88e" type="targz">mirrors://sourceforge/project/fuse/fuse-2.X/2.9.3/fuse-2.9.3.tar.gz</Archive>
+        <Archive sha1sum="c8b25419f33624dc5240af6a5d26f2c04367ca71" type="targz">mirrors://sourceforge/project/fuse/fuse-2.X/2.9.4/fuse-2.9.4.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>gettext-devel</Dependency>
         </BuildDependencies>
@@ -50,6 +50,13 @@
     </Package>
 
     <History>
+        <Update release="5">
+            <Date>2015-08-18</Date>
+            <Version>2.9.4</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="4">
             <Date>2014-05-11</Date>
             <Version>2.9.3</Version>
@@ -72,7 +79,7 @@
             <Email>marcin@pisilinux.org</Email>
         </Update>
         <Update release="1">
-            <Date>2012-20-21</Date>
+            <Date>2012-12-21</Date>
             <Version>2.9.2</Version>
             <Comment>First release</Comment>
             <Name>Yusuf Aydemir</Name>

system/base/gettext/pspec.xml

@@ -13,11 +13,13 @@
         <IsA>library</IsA>
         <Summary>GNU libraries and utilities for producing multi-lingual messages</Summary>
         <Description>The GNU gettext package provides a set of tools and documentation for producing multi-lingual messages in programs. Tools include a set of conventions about how programs should be written to support message catalogs, a directory and file naming organization for the message catalogs, a runtime library which supports the retrieval of translated messages, and stand-alone programs for handling the translatable and the already translated strings. Gettext provides an easy to use library and tools for creating, using, and modifying natural language catalogs and is a powerful and simple method for internationalizing programs.</Description>
-        <Archive sha1sum="c473f4f268501d971b913197fb07767e628644bb" type="targz">http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.4.tar.gz</Archive>
+        <Archive sha1sum="4d236852bd8d63e14d09eb6fc1f4da20a99f568b" type="targz">http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.6.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>acl-devel</Dependency>
             <Dependency>glib2-devel</Dependency>
-            <Dependency>ncurses</Dependency>
+            <Dependency>ncurses-devel</Dependency>
+            <Dependency>libunistring-devel</Dependency>
+            <Dependency>libxml2-devel</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -70,6 +72,20 @@
     </Package>
 
     <History>
+        <Update release="9">
+            <Date>2015-10-27</Date>
+            <Version>0.19.6</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="8">
+            <Date>2015-08-25</Date>
+            <Version>0.19.5.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="7">
             <Date>2015-04-03</Date>
             <Version>0.19.4</Version>

system/base/kbd/pspec.xml

@@ -12,10 +12,10 @@
         <IsA>app:console</IsA>
         <Summary>Keyboard and console utilities</Summary>
         <Description>The kbd package contains keytable files and keyboard utilities compatible with kernel version 1.1.54 and later.</Description>
-        <Archive sha1sum="37f21e078e1ed52f48ecb69584ec6a394d0f3146" type="tarxz">https://www.kernel.org/pub/linux/utils/kbd/kbd-2.0.2.tar.xz</Archive>
-        <Archive sha1sum="17625849ecf4dedf755aefa06d78406b92c31743" type="tarbz2" target="kbd-2.0.2">http://source.pisilinux.org/1.0/kbd-latarcyrheb-16-fixed.tar.bz2</Archive>
-        <Archive sha1sum="a5f6d9dff7a8a484cd5014ec7ffdf1eaed27084a" type="tarbz2" target="kbd-2.0.2">http://source.pisilinux.org/1.0/kbd-latsun-fonts.tar.bz2</Archive>
-        <Archive sha1sum="d52f95fdc761cead041d23992f8802be5ac4bc12" type="tarbz2" target="kbd-2.0.2">http://source.pisilinux.org/1.0/ro_maps.tar.bz2</Archive>
+        <Archive sha1sum="0a58dc928386f0f9c981fbefd24f05fc0b8226d7" type="tarxz">https://www.kernel.org/pub/linux/utils/kbd/kbd-2.0.3.tar.xz</Archive>
+        <Archive sha1sum="17625849ecf4dedf755aefa06d78406b92c31743" type="tarbz2" target="kbd-2.0.3">http://source.pisilinux.org/1.0/kbd-latarcyrheb-16-fixed.tar.bz2</Archive>
+        <Archive sha1sum="a5f6d9dff7a8a484cd5014ec7ffdf1eaed27084a" type="tarbz2" target="kbd-2.0.3">http://source.pisilinux.org/1.0/kbd-latsun-fonts.tar.bz2</Archive>
+        <Archive sha1sum="d52f95fdc761cead041d23992f8802be5ac4bc12" type="tarbz2" target="kbd-2.0.3">http://source.pisilinux.org/1.0/ro_maps.tar.bz2</Archive>
         <BuildDependencies>
             <Dependency>gettext</Dependency>
             <Dependency>gzip</Dependency>
@@ -30,7 +30,7 @@
             <Patch level="1">mandriva/kbd-1.15-remove-unneeded-calls.patch</Patch>
     
             <!-- Archlinux patches -->
-            <Patch level="1">archlinux/fix-dvorak-es.patch</Patch>
+            <!--Patch level="1">archlinux/fix-dvorak-es.patch</Patch-->
             <Patch level="1">archlinux/fix-euro2.patch</Patch>
 
             <!-- Pisi Linux patches -->
@@ -72,6 +72,13 @@
     </Package>
 
     <History>
+        <Update release="8">
+            <Date>2015-08-25</Date>
+            <Version>2.0.3</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="7">
             <Date>2015-05-08</Date>
             <Version>2.0.2</Version>

system/base/less/pspec.xml

@@ -12,7 +12,7 @@
         <IsA>app:console</IsA>
         <Summary>Excellent text file viewer</Summary>
         <Description>The less utility is a text file browser that resembles more, but has more capabilities. Less allows you to move backwards in the file as well as forwards. Since less doesn't have to read the entire input file before it starts, less starts up more quickly than text editors (for example, vi).</Description>
-        <Archive sha1sum="d5b07180d3dad327ccc8bc66818a31577e8710a2" type="targz">http://www.greenwoodsoftware.com/less/less-458.tar.gz</Archive>
+        <Archive sha1sum="58e7e62a760a9ca3636349de8e3357f7102aea1d" type="targz">http://www.greenwoodsoftware.com/less/less-481.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>ncurses-devel</Dependency>
         </BuildDependencies>
@@ -38,6 +38,13 @@
     </Package>
 
     <History>
+        <Update release="4">
+            <Date>2015-10-27</Date>
+            <Version>481</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="3">
             <Date>2014-05-11</Date>
             <Version>458</Version>

system/base/leveldb/actions.py

@@ -15,9 +15,9 @@ def check():
     autotools.make("check")
 
 def install():
-    pisitools.dolib_so("libleveldb.so.1.17")
-    pisitools.dosym("libleveldb.so.1.17", "/usr/lib/libleveldb.so.1")
-    pisitools.dosym("libleveldb.so.1.17", "/usr/lib/libleveldb.so")
+    pisitools.dolib_so("libleveldb.so.1.18")
+    pisitools.dosym("libleveldb.so.1.18", "/usr/lib/libleveldb.so.1")
+    pisitools.dosym("libleveldb.so.1.18", "/usr/lib/libleveldb.so")
 
     pisitools.insinto("/usr/include", "include/*")
     pisitools.insinto("/usr/include", "helpers/memenv/memenv.h")

system/base/leveldb/pspec.xml

@@ -16,7 +16,7 @@
             <Dependency>gperftools-devel</Dependency>
             <Dependency>snappy-devel</Dependency>
         </BuildDependencies>
-        <Archive sha1sum="5ab342abea35be281225bead169c1699828d1dde" type="targz">http://source.pisilinux.org/1.0/leveldb-e353fbc7ea81.tar.gz</Archive>
+        <Archive sha1sum="18684a0ad7a07920d10f5295b171fbf5eeec7337" type="targz">https://github.com/google/leveldb/archive/v1.18.tar.gz</Archive>
     </Source>
 
     <Package>
@@ -42,6 +42,13 @@
     </Package>
 
     <History>
+        <Update release="2">
+            <Date>2015-08-14</Date>
+            <Version>1.18</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="1">
             <Date>2014-06-02</Date>
             <Version>1.17</Version>

system/base/libpipeline/pspec.xml

@@ -12,7 +12,7 @@
         <IsA>library</IsA>
         <Summary>pipeline manipulation library</Summary>
         <Description>libpipeline is a C library for manipulating pipelines of subprocesses in a flexible and convenient way.</Description>
-        <Archive sha1sum="c4deac1c04670beac0e25d78ef1922e6a3740965" type="targz">http://download.savannah.gnu.org/releases/libpipeline/libpipeline-1.4.0.tar.gz</Archive>
+        <Archive sha1sum="b31cc955f22b1aa4545dc8d00ddbde831936594f" type="targz">http://download.savannah.gnu.org/releases/libpipeline/libpipeline-1.4.1.tar.gz</Archive>
     </Source>
 
     <Package>
@@ -38,6 +38,13 @@
     </Package>
 
     <History>
+        <Update release="7">
+            <Date>2015-08-24</Date>
+            <Version>1.4.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="6">
             <Date>2015-06-06</Date>
             <Version>1.4.0</Version>

system/base/lsb-release/files/lsb-release

@@ -1,4 +1,4 @@
 DISTRIB_ID="PisiLinux"
-DISTRIB_RELEASE="2.0Alfa3"
-DISTRIB_DESCRIPTION="Pisi GNU/Linux 2.0 Alfa3"
-DISTRIB_CODENAME="Essai"
+DISTRIB_RELEASE="2.0Alfa5"
+DISTRIB_DESCRIPTION="Pisi GNU/Linux 2.0 Alfa6"
+DISTRIB_CODENAME="Lost Cat"

system/base/lsb-release/pspec.xml

@@ -32,10 +32,17 @@
     </Package>
 
     <History>
-         <Update release="10">
-            <Date>2015-01-16</Date>
+        <Update release="11">
+            <Date>2015-10-30</Date>
             <Version>1.4</Version>
-            <Comment>Release Pisi Linux 2.0Alfa3</Comment>
+            <Comment>Release PisiLinux 2.0Alfa6.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+         <Update release="10">
+            <Date>2015-08-29</Date>
+            <Version>1.4</Version>
+            <Comment>Release Pisi Linux 2.0Alfa5</Comment>
             <Name>Ertuğrul Erata</Name>
             <Email>ertugrulerata@gmail.com</Email>
         </Update>

system/base/man-db/pspec.xml

@@ -14,7 +14,7 @@
         <IsA>data:doc</IsA>
         <Summary>Application to read Linux man pages</Summary>
         <Description>Man package consists of programs which is used to read most of the documentation available in linux system. For example, you can write "man nameoftheprogram" into the konsole or "man:nameoftheprogram" into the konqueror to get a detailed usage information for many programs.</Description>
-        <Archive sha1sum="6a4b08ccacb555120a2bce852329d93c9c78247e" type="tarxz">http://download.savannah.gnu.org/releases/man-db/man-db-2.7.1.tar.xz</Archive>
+        <Archive sha1sum="7c84408b94970b7dbdf2f80011b754fc2b238fee" type="tarxz">http://download.savannah.gnu.org/releases/man-db/man-db-2.7.4.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>less</Dependency>
             <Dependency>gzip</Dependency>
@@ -22,7 +22,7 @@
             <Dependency>gdbm-devel</Dependency>
             <Dependency>zlib-devel</Dependency>
             <Dependency>gettext-devel</Dependency>
-            <Dependency release="6">libpipeline-devel</Dependency>
+            <Dependency versionFrom="1.4.0">libpipeline-devel</Dependency>
         </BuildDependencies>
         <Patches>
             <!--<Patch level="1">man-db-2.5.9-sgr.patch</Patch>
@@ -39,8 +39,7 @@
         <RuntimeDependencies>
             <Dependency>gdbm</Dependency>
             <Dependency>zlib</Dependency>
-            <Dependency>gettext</Dependency>
-            <Dependency release="6">libpipeline</Dependency>
+            <Dependency versionFrom="1.4.0">libpipeline</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc</Path>
@@ -60,6 +59,20 @@
     </Package>
 
     <History>
+        <Update release="8">
+            <Date>2015-10-27</Date>
+            <Version>2.7.4</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="7">
+            <Date>2015-08-25</Date>
+            <Version>2.7.2</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="6">
             <Date>2015-06-06</Date>
             <Version>2.7.1</Version>