Merge pull request #639 from ertugerata/master

Update pspec.xml
2017-04-04 22:18:02 +03:00 · 2017-04-04 22:17:05 +03:00 · 2017-04-04 22:03:27 +03:00 · 2017-04-04 22:01:11 +03:00 · 2017-04-04 21:38:40 +03:00 · 2017-04-04 21:38:51 +03:00
606 changed files with 327438 additions and 140751 deletions
@@ -4,3 +4,4 @@
 *.svn
 *~
 .dir*
+*.log
@@ -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.** 

 ------------------------------------------------------------------------------

@@ -0,0 +1,2 @@
+2016-04-27 /system/boot/busybox-mkinitcpio/pspec.xml
+2016-04-27 /kernel/tools/mkinitcpio/pspec.xml
@@ -13,7 +13,7 @@
        <IsA>library</IsA>
        <Summary>A high-quality and portable font engine</Summary>
        <Description>FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and portable while capable of producing high-quality output. It can be used in graphics libraries, display servers, font conversion tools, text image generation tools, and many other products as well.</Description>
-        <Archive sha1sum="cd2b144205dd2c61693e2d861069367aa3dde1bc" type="tarbz2">mirrors://sourceforge/freetype/freetype-2.6.tar.bz2</Archive>
+        <Archive sha1sum="4d08a9a6567c6332d58e9a5f9a7e9e3fbce66789" type="tarbz2">mirrors://sourceforge/freetype/freetype-2.7.1.tar.bz2</Archive>
        <BuildDependencies>
            <Dependency>zlib-devel</Dependency>
            <Dependency>bzip2</Dependency>
@@ -62,7 +62,7 @@
            <Dependency>libpng-32bit</Dependency>
        </BuildDependencies>
        <RuntimeDependencies>
-            <Dependency>glibc-32bit</Dependency>
+            
            <Dependency>zlib-32bit</Dependency>
            <Dependency>libpng-32bit</Dependency>
        </RuntimeDependencies>
@@ -72,82 +72,26 @@
    </Package>

    <History>
-        <Update release="11">
-            <Date>2015-07-29</Date>
-            <Version>2.6</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="10">
-            <Date>2015-05-22</Date>
-            <Version>2.5.5</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Ayhan Yalçınsoy</Name>
-            <Email>ayhanyalcinsoy@pisilinux.org</Email>
-        </Update>
-        <Update release="9">
-            <Date>2014-05-11</Date>
-            <Version>2.5.3</Version>
-            <Comment>Release bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
-        </Update>
-        <Update release="8">
-            <Date>2014-03-29</Date>
-            <Version>2.5.3</Version>
-            <Comment>Version bump</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="7">
-            <Date>2013-12-11</Date>
-            <Version>2.5.2</Version>
-            <Comment>Version bump, cleanup.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="6">
-            <Date>2013-11-26</Date>
-            <Version>2.5.1</Version>
-            <Comment>Version bump</Comment>
-            <Name>Richard de Bruin</Name>
-            <Email>richdb@pisilinux.org</Email>
-        </Update>
-        <Update release="5">
-            <Date>2013-10-28</Date>
-            <Version>2.5.0.1</Version>
-            <Comment>rebuild.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="4">
-            <Date>2013-07-26</Date>
-            <Version>2.5.0.1</Version>
-            <Comment>Fix deps,release bump.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
        <Update release="3">
-            <Date>2013-06-28</Date>
-            <Version>2.5.0.1</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2017-02-02</Date>
+            <Version>2.7.1</Version>
+            <Comment>Version Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="2">
-            <Date>2013-01-14</Date>
-            <Version>2.4.11</Version>
-            <Comment>New release</Comment>
+            <Date>2016-04-27</Date>
+            <Version>2.6.3</Version>
+            <Comment>Release Bump</Comment>
            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="1">
-            <Date>2012-11-24</Date>
-            <Version>2.4.10</Version>
+            <Date>2016-03-13</Date>
+            <Version>2.6.3</Version>
            <Comment>First release</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Name>Alihan Öztürk</Name>
+            <Email>alihan@pisilinux.org</Email>
        </Update>
    </History>
 </PISI>
@@ -1,404 +1,25 @@
 <PISI>
    <SourceName>PisiLinux</SourceName>
-    <Version>1.0</Version>
-    <Description xml:lang="tr">PisiLinux 1.0 Deposu</Description>
-    <Description xml:lang="en">PisiLinux 1.0 Repository</Description>
-    <Description xml:lang="es">PisiLinux 1.0 Repositorio</Description>
-    <Description xml:lang="nl">PisiLinux 1.0 Opslagplaats</Description>
+    <Version>2.0</Version>
+    <Description xml:lang="tr">PisiLinux 2.0 Core Deposu</Description>
+    <Description xml:lang="en">PisiLinux 2.0 Core Repository</Description>
+    <Description xml:lang="es">PisiLinux 2.0 Core Repositorio</Description>
+    <Description xml:lang="nl">PisiLinux 2.0 Core Opslagplaats</Description>
    <Type>Core</Type>
    <BinaryName>PisiLinux</BinaryName>
    <Obsoletes>
-        <Package>xorg-video-modesetting</Package>
-        <Package>glamor-egl</Package>
-        <Package>glamor-egl-devel</Package>
-        <Package>kdeadmin</Package>
-        <Package>kdenetwork</Package>
-        <Package>kdenetwork-devel</Package>
-        <Package>kdesdk</Package>
-        <Package>kdesdk-devel</Package>
-        <Package>kdeplasma-applets-fancytasks</Package>
-        <Package>kdetoys</Package>
-        <Package>libfakeley</Package>
-        <Package>libfakeley-devel</Package>
-        <Package>libstreams</Package>
-        <Package>libstreamanalyzer</Package>
-        <Package>libstreams-devel</Package>
-        <Package>libstreamanalyzer-devel</Package>
-        <Package>strigi-libs</Package>
-        <Package>strigi-common</Package>
-        <Package>workspace-strap</Package>
-        <Package>gtk-qt-engine</Package>
-        <Package>kdevplatform-l10n-nds</Package>
-        <Package>kdevplatform-l10n-en_GB</Package>
-        <Package>db5</Package>
-        <Package>db5-devel</Package>
-        <Package>db5-docs</Package>
-        <Package>ntfs_3g</Package>
-        <Package>db4-java</Package>
-        <Package>db5-java</Package>
-        <Package>jpeg</Package>
-        <Package>openthreads</Package>
-        <Package>aufs-progs</Package>
-        <Package>python-cherrypy</Package>
-        <Package>hd2u</Package>
-        <Package>mmpython</Package>
-        <Package>libtextcat</Package>
-        <Package>xorg-input-fpit</Package>
-        <Package>xorg-input-hyperpen</Package>
-        <Package>xorg-input-mutouch</Package>
-        <Package>xorg-input-penmount</Package>
-        <Package>xorg-video-ark</Package>
-        <Package>xorg-video-ast</Package>
-        <Package>xorg-video-chips</Package>
-        <Package>xorg-video-nv</Package>
-        <Package>xorg-video-s3</Package>
-        <Package>xorg-video-tseng</Package>
-        <Package>libXp-devel</Package>
-        <Package>ijs</Package>
-        <Package>ijs-devel</Package>
-        <Package>xfce-utils</Package>
-        <Package>lxsession-edit</Package>
-        <Package>zeitgeist-datahub</Package>
-        <Package>soundKonverter</Package>
-        <Package>module-fglrx-legacy</Package>
-        <Package>module-fglrx-legacy-userspace</Package>
-        <Package>module-fglrx-legacy-devel</Package>
-        <Package>fglrx-legacy-devel</Package>
-        <Package>fglrx-legacy-opencl</Package>
-        <Package>fglrx-legacy-opencl-32bit</Package>
-        <Package>xorg-video-fglrx-legacy</Package>
-        <Package>xorg-video-fglrx-legacy-32bit</Package>
-        <Package>fglrx-devel</Package>
-        <Package>fglrx-opencl-32bit</Package>
-        <Package>fglrx-opencl</Package>
-        <Package>module-fglrx-userspace</Package>
-        <Package>plex-media-server</Package>
-        <Package>libreoffice-bsh</Package>
-        <Package>libreoffice-ure</Package>
-        <Package>libreoffice-pyuno</Package>
-        <Package>libreoffice-nlpsolver</Package>
-        <Package>libreoffice-pdfimport</Package>
-        <Package>libreoffice-xsltfilter</Package>
-        <Package>libreoffice-java-common</Package>
-        <Package>libreoffice-graphicfilter</Package>
-        <Package>libreoffice-wiki-publisher</Package>
-        <Package>libreoffice-presentation-minimizer</Package>
-        <Package>libreoffice-javafilter</Package>
-        <Package>libreoffice-report-builder</Package>
-        <Package>glest</Package>
-        <Package>glest-data</Package>
-        <Package>liboldX</Package>
-        <Package>liboldX-devel</Package>
-        <Package>glitz-devel</Package>
-        <Package>glitz-32bit</Package>
-        <Package>glitz</Package>
-        <Package>mate-bluetooth</Package>
-        <Package>mate-bluetooth-devel</Package>
-        <Package>mate-bluetooth-doc</Package>
-        <Package>glade-xfce</Package>
-        <Package>eatmonkey</Package>
-        <Package>gnome-activity-journal</Package>
-        <Package>gnome-mime-data</Package>
-        <Package>libgnomecups</Package>
-        <Package>libgnomecups-devel</Package>
-        <Package>libgnomeprint</Package>
-        <Package>libgnomeprint-devel</Package>
-        <Package>libgnomeprint-docs</Package>
-        <Package>libgnomeprintui</Package>
-        <Package>libgnomeprintui-devel</Package>
-        <Package>libgnomeprintui-docs</Package>
-        <Package>gnome-desktop-sharp</Package>
-        <Package>gnome-desktop-sharp-devel</Package>
-        <Package>gnome-print-sharp</Package>
-        <Package>gnome-print-sharp-devel</Package>
-        <Package>gtksourceview-sharp</Package>
-        <Package>gtksourceview-sharp-devel</Package>
-        <Package>vte-sharp</Package>
-        <Package>vte-sharp-devel</Package>
-        <Package>wnck-sharp</Package>
-        <Package>wnck-sharp-devel</Package>
-        <Package>rsvg-sharp</Package>
-        <Package>rsvg-sharp-devel</Package>
-        <Package>gsettings-desktop-schemas3</Package>
-        <Package>gsettings-desktop-schemas3-devel</Package>
-        <Package>libgee-8</Package>
-        <Package>libgee-8-devel</Package>
-        <Package>gnutls-guile</Package>
-        <Package>liborcus</Package>
-        <Package>liborcus-devel</Package>
-        <Package>libixion</Package>
-        <Package>epdfview</Package>
-        <Package>libixion-devel</Package>
-        <Package>lv2core</Package>
-        <Package>lv2core-devel</Package>
-        <Package>amd-ucode</Package>
-        <Package>akonadi-facebook</Package>
-        <Package>perl-Email-Simple-Creator</Package>
-        <Package>licq-autoreply</Package>
-        <Package>licq-console</Package>
-        <Package>licq-msn</Package>
-        <Package>licq-forwarder</Package>
-        <Package>licq-osd</Package>
-        <Package>licq-rms</Package>
-        <Package>licq-devel</Package>
-        <Package>perl-IO-via-symlink</Package>
-        <Package>SVK</Package>
-        <Package>avidemux</Package>
-        <Package>qsvn</Package>
-        <Package>libsvnqt</Package>
-        <Package>libsvnqt-devel</Package>
-        <Package>cups-php</Package>
-        <Package>metalink</Package>
-        <Package>foomatic-filters</Package>
-        <Package>pisilinux-default-settings</Package>
-        <Package>mysql-client</Package>
-        <Package>mysql-lib</Package>
-        <Package>mysql-man-pages</Package>
-        <Package>mysql-server</Package>
-        <Package>sun-jre</Package>
-        <Package>sun-jdk</Package>
-        <Package>gnash</Package>
-        <Package>gnash-devel</Package>
-        <Package>gnash-klash</Package>
-        <Package>gst-buzztard</Package>
-        <Package>gst-buzztard-doc</Package>
-        <Package>libgst-buzztard</Package>
-        <Package>libgst-buzztard-devel</Package>
-        <Package>tv-viewer</Package>
-        <Package>module-nvidia-current-userspace</Package>
-        <Package>module-nvidia304-userspace</Package>
-        <Package>module-nvidia173-userspace</Package>
-        <Package>module-nvidia96-userspace</Package>
-        <Package>samba-swat</Package>
-        <Package>comp-scale</Package>
-        <Package>ntrack</Package>
-        <Package>ntrack-devel</Package>
-        <Package>ntrack-glib</Package>
-        <Package>ntrack-glib-devel</Package>
-        <Package>ntrack-gobject</Package>
-        <Package>ntrack-gobject-devel</Package>
-        <Package>ntrack-qt4</Package>
-        <Package>ntrack-qt4-devel</Package>
-        <Package>python-ntrack</Package>
-        <Package>qzion</Package>
-        <Package>qzion-devel</Package>
-        <Package>qedje-devel</Package>
-        <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>
-        <Package>kde-l10n-tg-doc</Package>
-        <Package>kde-l10n-th</Package>
-        <Package>kde-l10n-th-doc</Package>
-        <Package>kdnssd</Package>
-        <Package>mate-file-manager</Package>
-        <Package>mate-file-manager-devel</Package>
-        <Package>mate-file-manager-doc</Package>
-        <Package>mate-window-manager</Package>
-        <Package>mate-window-manager-devel</Package>
-        <Package>mate-doc-utils</Package>
-        <Package>libmatewnck-devel</Package>
-        <Package>libmatewnck-doc</Package>
-        <Package>libmatewnck</Package>
-        <Package>libmatekeyring</Package>
-        <Package>libmatekeyring-devel</Package>
-        <Package>libmatekeyring-doc</Package>
-        <Package>mate-keyring</Package>
-        <Package>mate-keyring-devel</Package>
-        <Package>mate-keyring-doc</Package>
-        <Package>mate-character-map</Package>
-        <Package>mate-character-map-devel</Package>
-        <Package>mate-document-viewer</Package>
-        <Package>mate-document-viewer-devel</Package>
-        <Package>mate-document-viewer-doc</Package>
-        <Package>mate-file-archiver</Package>
-        <Package>mate-image-viewer</Package>
-        <Package>mate-image-viewer-devel</Package>
-        <Package>mate-image-viewer-doc</Package>
-        <Package>mate-file-manager-gksu</Package>
-        <Package>mate-file-manager-sendto</Package>
-        <Package>mate-file-manager-sendto-devel</Package>
-        <Package>mate-file-manager-sendto-doc</Package>
-        <Package>mate-file-manager-share</Package>
-        <Package>mate-file-manager-open-terminal</Package>
-        <Package>mate-file-manager-image-converter</Package>
-        <Package>mate-text-editor</Package>
-        <Package>mate-text-editor-devel</Package>
-        <Package>mate-text-editor-gtk-doc</Package>
-        <Package>mate-menu-editor</Package>
-        <Package>kio-afc</Package>
-        <Package>epson-alc1100</Package>
-        <Package>thunderbird-lang-es-CL</Package>
-        <Package>emacs-emms</Package>
-        <Package>ecore</Package>
-        <Package>ecore-devel</Package>
-        <Package>edje</Package>
-        <Package>edje-devel</Package>
-        <Package>eet</Package>
-        <Package>eet-devel</Package>
-        <Package>eeze</Package>
-        <Package>eeze-devel</Package>
-        <Package>efreet</Package>
-        <Package>efreet-devel</Package>
-        <Package>eina</Package>
-        <Package>eina-devel</Package>
-        <Package>eio</Package>
-        <Package>eio-devel</Package>
-        <Package>emap</Package>
-        <Package>emap-devel</Package>
-        <Package>embryo</Package>
-        <Package>embryo-devel</Package>
-        <Package>epdf</Package>
-        <Package>epdf-devel</Package>
-        <Package>ethumb</Package>
-        <Package>ethumb-devel</Package>
-        <Package>evas</Package>
-        <Package>evas-devel</Package>
-        <Package>emotion-devel</Package>
-        <Package>emotion</Package>
-        <Package>firefox-devel</Package>
-        <Package>chipmunk</Package>
-        <Package>chipmunk-devel</Package>
-        <Package>e-module-alarm</Package>
-        <Package>e-module-calendar</Package>
-        <Package>e-module-comp-scale</Package>
-        <Package>e-module-cpu</Package>
-        <Package>e-module-deskshow</Package>
-        <Package>e-module-diskio</Package>
-        <Package>e-module-drawer</Package>
-        <Package>e-module-eektool</Package>
-        <Package>e-module-eenvader-fractal</Package>
-        <Package>e-module-elfe</Package>
-        <Package>e-module-empris</Package>
-        <Package>e-module-engage</Package>
-        <Package>e-module-eooorg</Package>
-        <Package>e-module-everything-aspell</Package>
-        <Package>e-module-everything-pidgin</Package>
-        <Package>e-module-everything-places</Package>
-        <Package>e-module-everything-shotgun</Package>
-        <Package>e-module-everything-skeleton</Package>
-        <Package>e-module-everything-tracker</Package>
-        <Package>e-module-everything-wallpaper</Package>
-        <Package>e-module-everything-websearch</Package>
-        <Package>e-module-eweather</Package>
-        <Package>e-module-exebuf</Package>
-        <Package>e-module-execwatch</Package>
-        <Package>e-module-flame</Package>
-        <Package>e-module-forecasts</Package>
-        <Package>e-module-iiirk</Package>
-        <Package>e-module-itask</Package>
-        <Package>e-module-mail</Package>
-        <Package>e-module-mem</Package>
-        <Package>e-module-moon</Package>
-        <Package>e-module-mpdule</Package>
-        <Package>e-module-net</Package>
-        <Package>e-module-news</Package>
-        <Package>e-module-penguins</Package>
-        <Package>e-module-photo</Package>
-        <Package>e-module-places</Package>
-        <Package>e-module-rain</Package>
-        <Package>e-module-screenshot</Package>
-        <Package>e-module-skel</Package>
-        <Package>e-module-snow</Package>
-        <Package>e-module-taskbar</Package>
-        <Package>e-module-tclock</Package>
-        <Package>e-module-uptime</Package>
-        <Package>e-module-weather</Package>
-        <Package>e-module-winlist-ng</Package>
-        <Package>e-module-winselector</Package>
-        <Package>e-module-wlan</Package>
-        <Package>econcentration</Package>
-        <Package>editje</Package>
-        <Package>emprint</Package>
-        <Package>enki</Package>
-        <Package>enlil</Package>
-        <Package>enlil-devel</Package>
-        <Package>etrophy</Package>
-        <Package>etrophy-devel</Package>
-        <Package>expedite</Package>
-        <Package>lightmediascanner</Package>
-        <Package>lightmediascanner-devel</Package>
-        <Package>libeweather</Package>
-        <Package>libeweather-devel</Package>
-        <Package>python-elementary-devel</Package>
-        <Package>python-elementary</Package>
-        <Package>python-edje-devel</Package>
-        <Package>python-edje</Package>
-        <Package>python-evas-devel</Package>
-        <Package>python-evas</Package>
-        <Package>python-ethumb-devel</Package>
-        <Package>python-ethumb</Package>
-        <Package>python-ecore-devel</Package>
-        <Package>python-ecore</Package>
-        <Package>python-speech-dispatcher</Package>
-        <Package>nepomuk-core</Package>
-        <Package>nepomuk-core-devel</Package>
-        <Package>nepomuk-widgets</Package>
-        <Package>nepomuk-widgets-devel</Package>
-        <Package>wine-gecko64</Package>
-        <Package>wine64</Package>
-        <Package>glade3</Package>
-        <Package>glade3-devel</Package>
-        <Package>glade3-docs</Package>
-        <Package>goocanvas</Package>
-        <Package>goocanvas-docs</Package>
-        <Package>goocanvas-devel</Package>
-        <Package>goocanvasmm</Package>
-        <Package>goocanvasmm-doc</Package>
-        <Package>goocanvasmm-devel</Package>
-        <Package>libgtkhtml2</Package>
-        <Package>libgtkhtml2-devel</Package>
-        <Package>bluez-compat</Package>
-        <Package>bluedevil-devel</Package>
-        <Package>akonadi-facebook</Package>
-        <Package>python-PyMT</Package>
-        <Package>python-PyMT-docs</Package>
-        <Package>OpenGTL</Package>
-        <Package>OpenGTL-devel</Package>
-        <Package>gtkdatabox-glade</Package>
-        <Package>gtkdatabox-docs</Package>
-        <Package>vo-aacenc</Package>
-        <Package>lxshortcut</Package>
-        <Package>libusbx</Package>
-        <Package>libusbx-devel</Package>
-        <Package>libusbx-32bit</Package>
-        <Package>labltk</Package>
-        <Package>udev</Package>
-        <Package>libudev</Package>
-        <Package>libgudev1</Package>
-        <Package>libudev-devel</Package>
-        <Package>libgudev1-devel</Package>
-        <Package>libudev-32bit</Package>
-        <Package>libgudev1-32bit</Package>
-        <Package>mdbtools-gui</Package>
-        <Package>module-nvidia96</Package>
-        <Package>xorg-video-nvidia96</Package>
-        <Package>module-nvidia173</Package>
-        <Package>xorg-video-nvidia173</Package>
-        <Package>libfm</Package>
-        <Package>libfm-devel</Package>
-        <Package>lxappearance</Package>
-        <Package>lxappearance-devel</Package>
-        <Package>lxappearance-obconf</Package>
-        <Package>lxde-common</Package>
-        <Package>lxde-menu-cache</Package>
-        <Package>lxde-menu-cache-devel</Package>
-        <Package>lxinput</Package>
-        <Package>lxmenu-data</Package>
-        <Package>lxpanel</Package>
-        <Package>lxpanel-devel</Package>
-        <Package>lxpolkit</Package>
-        <Package>lxrandr</Package>
-        <Package>lxsession</Package>
-        <Package>lxtask</Package>
-        <Package>lxterminal</Package>
-        <Package>pcmanfm</Package>
-        <Package>pcmanfm-devel</Package>
-        <Package>gpicview</Package>
-        <Package>lxlauncher</Package>
-        <Package>screengrab</Package>
-    </Obsoletes>
+           <!--glibc-32bit merge in glibc-->
+           <Package>glibc-32bit</Package>
+           <!-- separeted, replaced packages-->
+           <Package>kdgantt2</Package>
+           <Package>gpgmepp</Package>
+           <Package>kde-baseapps</Package>
+           <Package>prison-qt5</Package>
+           <Package>xorg-video-modesetting</Package>
+           <!--for yali -->
+           <Package>busybox-mkinitcpio</Package>
+           <Package>mkinitcpio</Package>
+           <Package>Calamares</Package>
+           <Package>calamares-theme-pisilinux</Package>
+      </Obsoletes>
 </PISI>
@@ -15,8 +15,8 @@ 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"
+pisirepouri = "http://ciftlik.pisilinux.org/2.0-Beta.1/pisi-index.xml.xz"
+svnrepouri  = "https://github.com/ertugerata/core/raw/master/pisi-index.xml.xz"

 def getIndex(uri):
    try:
@@ -36,25 +36,25 @@

    <History>
        <Update release="3">
+            <Date>2017-02-07</Date>
+            <Version>9</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="2">
+            <Date>2016-04-27</Date>
+            <Version>9</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
+        <Update release="1">
            <Date>2015-04-01</Date>
            <Version>9</Version>
-            <Comment>Release bump.</Comment>
+            <Comment>First release</Comment>
            <Name>Marcin Bojara</Name>
            <Email>marcin@pisilinux.org</Email>
        </Update>
-        <Update release="2">
-            <Date>2013-10-29</Date>
-            <Version>9</Version>
-            <Comment>Rebuild</Comment>
-            <Name>Yusuf Aydemir</Name>
-            <Email>yusuf.aydemir@pisilinux.org</Email>
-        </Update>
-        <Update release="1">
-            <Date>2012-08-23</Date>
-            <Version>9</Version>
-            <Comment>First release</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
-        </Update>
    </History>
 </PISI>
@@ -19,7 +19,15 @@ def builddiet():
    autotools.make("distclean")

    autotools.autoreconf("-fi")
-    autotools.configure('ac_cv_lib_dl_dlopen=no \
+    autotools.configure('--with-thin-check=    \
+                         --with-thin-dump=     \
+                         --with-thin-repair=   \
+                         --with-thin-restore=  \
+                         --with-cache-check=   \
+                         --with-cache-dump=    \
+                         --with-cache-repair=  \
+                         --with-cache-restore= \
+                         ac_cv_lib_dl_dlopen=no \
                         --with-staticdir="/sbin" \
                         --enable-debug \
                         --with-optimisation=\"%s -Os\" \
@@ -36,8 +44,8 @@ def builddiet():
                         --with-systemdsystemunitdir=no \
                         --enable-udev_sync' % get.CFLAGS())

-    pisitools.dosed("lib/misc/configure.h","rpl_malloc","malloc")
-    pisitools.dosed("lib/misc/configure.h","rpl_realloc","realloc")
+    #pisitools.dosed("lib/misc/configure.h","rpl_malloc","malloc")
+    #pisitools.dosed("lib/misc/configure.h","rpl_realloc","realloc")

    autotools.make("-j1 -C include")
    autotools.make("-j1 -C lib LIB_SHARED= VERSIONED_SHLIB=")
@@ -58,7 +66,15 @@ def setup():
    pisitools.dosed("conf/example.conf.in", "use_lvmetad = 0", "use_lvmetad = 1")

    autotools.autoreconf("-fi")
-    autotools.configure("--enable-lvm1_fallback \
+    autotools.configure("--with-thin-check=    \
+                         --with-thin-dump=     \
+                         --with-thin-repair=   \
+                         --with-thin-restore=  \
+                         --with-cache-check=   \
+                         --with-cache-dump=    \
+                         --with-cache-repair=  \
+                         --with-cache-restore= \
+                         --enable-lvm1_fallback \
                         --with-default-pid-dir=/run \
                         --with-default-run-dir=/run/lvm \
                         --with-default-locking-dir=/run/lock/lvm \
@@ -12,16 +12,17 @@
        <IsA>app:console</IsA>
        <Summary>Userland logical volume management tools</Summary>
        <Description>LVM2 includes all of the support for handling read/write operations physical and logical volumes.</Description>
-        <Archive sha1sum="4f45406eb122443a0a9a3f2d338d5203d94d93de" type="targz">ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.118.tgz</Archive>
+        <Archive sha1sum="35b7358ebefefbf1fceb50bf282c328203248bdb" type="targz">ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.167.tgz</Archive>
        <BuildDependencies>
-            <Dependency releaseFrom="9">libutil-linux-devel</Dependency>
+            <Dependency>libutil-linux-devel</Dependency>
            <Dependency>eudev-devel</Dependency>
+            <Dependency>autoconf-archive</Dependency>
        </BuildDependencies>
        <Patches>
            <!--<Patch level="1">lvm2-2.02.63-always-make-static-libdm.patch</Patch>
            <Patch level="1">lvm2-2.02.92-dynamic-static-ldflags.patch</Patch>
            <Patch level="1">lvm2-2.02.105-pthread-pkgconfig.patch</Patch>
-	  <Patch>lvm2-2.02.106-static-pkgconfig-libs.patch</Patch>-->
+            <Patch>lvm2-2.02.106-static-pkgconfig-libs.patch</Patch>-->
        </Patches>
    </Source>

@@ -34,6 +35,7 @@
        <Description>Device-mapper includes the driver enables the definition of new block devices composed of ranges of sectors of existing devices to define disk partitions or logical volumes.</Description>
        <Files>
            <Path fileType="executable">/usr/sbin/dmsetup</Path>
+            <Path fileType="executable">/usr/sbin/dmstats</Path>
            <Path fileType="library">/usr/lib/libdevmapper.a</Path>
            <Path fileType="library">/usr/lib/libdevmapper.so*</Path>
            <Path fileType="data">/lib/udev/rules.d/10-dm.rules</Path>
@@ -42,6 +44,7 @@
            <Path fileType="doc">/usr/share/doc/VERSION_DM</Path>
            <Path fileType="doc">/usr/share/doc/WHATS_NEW_DM</Path>
            <Path fileType="man">/usr/share/man/man8/dmsetup.8</Path>
+            <Path fileType="man">/usr/share/man/man8/dmstats.8</Path>
        </Files>
    </Package>

@@ -180,58 +183,32 @@
        <Description>Number of utilities for creating, checking, and repairing logical volumes - statically linked for initramfs.</Description>
        <Files>
            <Path fileType="executable">/sbin/lvm.static</Path>
+            <Path fileType="library">/usr/lib/liblvm2app.a</Path>
+            <Path fileType="library">/usr/lib/liblvm2cmd.a</Path>
        </Files>
    </Package>

    <History>
-        <Update release="7">
-            <Date>2015-05-02</Date>
-            <Version>2.02.118</Version>
+        <Update release="3">
+            <Date>2017-01-29</Date>
+            <Version>2.02.167</Version>
            <Comment>Version bump.</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
        </Update>
-        <Update release="6">
-            <Date>2014-09-04</Date>
-            <Version>2.02.111</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
-        </Update>
-        <Update release="5">
-            <Date>2014-05-09</Date>
-            <Version>2.02.106</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
-        </Update>
-        <Update release="4">
-            <Date>2014-04-07</Date>
-            <Version>2.02.105</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
-        </Update>
-        <Update release="3">
-            <Date>2013-11-09</Date>
-            <Version>2.02.103</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
-        </Update>
        <Update release="2">
-            <Date>2013-07-26</Date>
-            <Version>2.02.98</Version>
-            <Comment>Fix dep, release bump.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptanan@pisilinux.org</Email>
+            <Date>2016-04-27</Date>
+            <Version>2.02.142</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="1">
-            <Date>2012-11-14</Date>
-            <Version>2.02.98</Version>
+            <Date>2016-03-13</Date>
+            <Version>2.02.142</Version>
            <Comment>First release</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
    </History>
 </PISI>
@@ -12,7 +12,10 @@
        <IsA>app:console</IsA>
        <Summary>Utility to control Linux MD devices (software RAID arrays)</Summary>
        <Description>mdadm is used to create, manage, and monitor Linux MD (software RAID) devices.</Description>
-        <Archive sha1sum="c649601d84553501c2f3b452cf93d1fbc53f976a" type="tarxz">https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-3.3.2.tar.xz</Archive>
+        <Archive sha1sum="0b6c284970567bfa30dbc14ea5c0e2320582b80c" type="tarxz">https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-3.4.tar.xz</Archive>
+        <BuildDependencies>
+            <Dependency>dietlibc</Dependency>
+        </BuildDependencies>
    </Source>

    <Package>
@@ -51,40 +54,26 @@
    </Package>

    <History>
-        <Update release="5">
-            <Date>2015-05-25</Date>
-            <Version>3.3.2</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Yusuf Aydemir</Name>
-            <Email>yusuf.aydemir@pisilinux.org</Email>
-        </Update>
-        <Update release="4">
-            <Date>2014-05-17</Date>
-            <Version>3.3</Version>
-            <Comment>Rebuild. Fixed service.py file</Comment>
-            <Name>Aydın Demirel</Name>
-            <Email>aydin.demirel@pisilinux.org</Email>
-        </Update>
        <Update release="3">
-            <Date>2014-04-13</Date>
-            <Version>3.3</Version>
-            <Comment>mdadm-static is a part of system.base now.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2017-01-29</Date>
+            <Version>3.4</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="2">
-            <Date>2014-01-31</Date>
-            <Version>3.3</Version>
-            <Comment>Ver. bump, rebuild</Comment>
-            <Name>Kamil Atlı</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Date>2016-04-27</Date>
+            <Version>3.4</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="1">
-            <Date>2012-11-14</Date>
-            <Version>3.2.6</Version>
+            <Date>2016-03-13</Date>
+            <Version>3.4</Version>
            <Comment>First release</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
    </History>
 </PISI>
@@ -0,0 +1,31 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Licensed under the GNU General Public License, version 3.
+# See the file http://www.gnu.org/licenses/gpl.txt
+
+from pisi.actionsapi import autotools
+from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
+from pisi.actionsapi import get
+
+def setup():
+    #for i in ["mtools.texi"]:
+    #    pisitools.dosed(i, "/usr/local/etc", "/etc")
+
+    shelltools.export("INSTALL_PROGRAM", "install")
+    autotools.autoreconf("-fi")
+    autotools.configure("--prefix=/usr \
+			             --sysconfdir=/etc/mtools \
+                         --includedir=/usr/src/linux/include")
+
+def build():
+    autotools.make()
+    pisitools.dosed("mtools.conf","SAMPLE FILE","#SAMPLE FILE")
+def install():
+    autotools.rawInstall('-j1 DESTDIR="%s"' % get.installDIR())
+    
+
+    pisitools.insinto("/etc/mtools","mtools.conf")
+    
+    pisitools.dodoc("COPYING", "README*", "Release.notes")
@@ -0,0 +1,52 @@
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<PISI>
+    <Source>
+        <Name>mtools</Name>
+        <Homepage>http://mtools.linux.lu/</Homepage>
+        <Packager>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Packager>
+        <License>GPLv2</License>
+        <IsA>app:console</IsA>
+        <Summary>Utilities to access MS-DOS disks without mounting them</Summary>
+        <Description>Mtools are utilities to access MS-DOS disks without mounting them.</Description>
+        <Archive sha1sum="d703db71a409837a37db10a09ef63a35183f7565" type="targz">mirrors://gnu/mtools/mtools-4.0.18.tar.gz</Archive>
+    </Source>
+
+    <Package>
+        <Name>mtools</Name>
+        <Files>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="config">/etc</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="info">/usr/share/info</Path>
+            <Path fileType="man">/usr/share/man</Path>
+        </Files>
+    </Package>
+
+    <History>
+        <Update release="3">
+            <Date>2017-01-29</Date>
+            <Version>4.0.18</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="2">
+            <Date>2016-04-27</Date>
+            <Version>4.0.18</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
+	    <Update release="1">
+            <Date>2014-02-12</Date>
+            <Version>4.0.18</Version>
+            <Comment>First release</Comment>
+            <Name>Richard de Bruin</Name>
+            <Email>richdb@pisilinux.org</Email>
+        </Update>
+    </History>
+</PISI>
@@ -0,0 +1,8 @@
+<?xml version="1.0" ?>
+<PISI>
+    <Source>
+        <Name>mtools</Name>
+        <Summary xml:lang="tr">MS-DOS (Windows) disketlerinize -mount ile bağlamadan- erişim araçları</Summary>
+        <Description xml:lang="tr">Mtools diskinizdeki MS-DOS (Windows) bölümlerine -mount komutu ile bağlamadan- erişebilmek için gereken araç setidir.</Description>
+    </Source>
+</PISI>
@@ -17,27 +17,24 @@
        <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: 3ef7857d511ce6a91c5ce609da76c4702651cfa5 2016-06-24 -->
+        <Archive sha1sum="06c03884d5e2540d0bb4918c1f348a7c46f6a496" type="tarbz2">https://sourceforge.net/projects/pisilinux/files/source/linux-firmware-20170113.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>
        <Archive sha1sum="6c18b28e62637fb809eaff89fff623ae1d470500" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/ar9170.tar.bz2</Archive>
        <Archive sha1sum="aa3b414c2948be5f226a25fa5f37e56fd659a3bb" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/ipw2x00-firmware.tar.bz2</Archive>
        <Archive sha1sum="f7ecf5412b7818871fa2798f1b314f8ddddb494e" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/aic94xx-seq.tar.bz2</Archive>
-        <Archive sha1sum="9be626663e9b9d15278f2b5cd1c916570eb62727" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/zd12x1-firmware.tar.bz2</Archive>
        <Archive sha1sum="16d5f4dcc90f978732a9a5b3b0347672a6cc4c36" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/accessrunner-firmware.tar.bz2</Archive>
        <Archive sha1sum="e40729d30ad6d7a6c88b90ee7bc5fbaeb9458cb7" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/rtl8192se-firmware.tar.bz2</Archive>
-        <Archive sha1sum="5d333e75f02a57861565337c14f6944090a242a8" type="tarxz" target="linux-firmware/mix">http://source.pisilinux.org/erdinc/firmware/nouveau-1.tar.xz</Archive>
+        <Archive sha1sum="ff9e7f4b120476a90cd3fb69d76240166c4ff2a5" type="tarbz2" target="linux-firmware/mix">http://sourceforge.net/projects/pisilinux/files/source/zd12x1.tar.bz2</Archive>
+        <Archive sha1sum="3239212ae7c5f60baa749764dcb8f5189e1e2f13" type="tarxz" target="linux-firmware/mix">http://sourceforge.net/projects/pisilinux/files/source/nouveau-340-32.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="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>
+            <AdditionalFile target="iwlwifi-7260-17.ucode">iwlwifi-7260-17.ucode</AdditionalFile>
        </AdditionalFiles>
-        <!--<BuildDependencies>
-            <Dependency>rpm2targz</Dependency>
-        </BuildDependencies>-->
-        <Patches>
-            <!-- Remove all patches, all dead :) -->
-        </Patches>
    </Source>

    <Package>
@@ -52,124 +49,33 @@
    </Package>

    <History>
-          <Update release="17">
-            <Date>2015-07-20</Date>
-            <Version>20150716</Version>
-            <Comment>Version bump.</Comment>
+         <Update release="4">
+            <Date>2017-02-11</Date>
+            <Version>20170113</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
+        <Update release="3">
+            <Date>2016-06-29</Date>
+            <Version>20160624</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
+        <Update release="2">
+            <Date>2016-04-27</Date>
+            <Version>20160111</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
+        <Update release="1">
+            <Date>2016-01-22</Date>
+            <Version>20160111</Version>
+            <Comment>First release</Comment>
            <Name>Ertuğrul Erata</Name>
            <Email>ertugrulerata@gmail.com</Email>
         </Update>
-         <Update release="16">
-            <Date>2015-03-26</Date>
-            <Version>20150320</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="15">
-            <Date>2015-02-14</Date>
-            <Version>20150214</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>     
-        <Update release="14">
-            <Date>2014-12-16</Date>
-            <Version>20141216</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-         <Update release="13">
-            <Date>2014-11-07</Date>
-            <Version>20141107</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="12">
-            <Date>2014-07-23</Date>
-            <Version>20140603</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin.bojara@pisilinux.org</Email>
-        </Update>
-        <Update release="11">
-            <Date>2014-04-02</Date>
-            <Version>20140316</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="10">
-            <Date>2014-03-01</Date>
-            <Version>20140217</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-         <Update release="9">
-            <Date>2013-11-30</Date>
-            <Version>20131013</Version>
-            <Comment>Remove unneeded build dep,fix unpack problem.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="8">
-            <Date>2013-11-23</Date>
-            <Version>20131013</Version>
-            <Comment>Version bump to 20131013 git.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="7">
-            <Date>2013-09-30</Date>
-            <Version>20130811</Version>
-            <Comment>add update Intel-Bluetooth patchs</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
-        </Update>
-        <Update release="6">
-            <Date>2013-08-11</Date>
-            <Version>20130811</Version>
-            <Comment>add update patchs</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
-        </Update>
-        <Update release="5">
-            <Date>2013-07-19</Date>
-            <Version>20130609</Version>
-            <Comment>add update patchs</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
-        </Update>
-        <Update release="4">
-            <Date>2013-06-09</Date>
-            <Version>20130609</Version>
-            <Comment>bump</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
-        </Update>
-        <Update release="3">
-            <Date>2013-04-07</Date>
-            <Version>20130421</Version>
-            <Comment>bump</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
-        </Update>
-        <Update release="2">
-            <Date>2013-03-07</Date>
-            <Version>20130224</Version>
-            <Comment>bump</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
-        </Update>
-        <Update release="1">
-            <Date>2012-12-12</Date>
-            <Version>20121212</Version>
-            <Comment>First release</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
-        </Update>
    </History>
 </PISI>
@@ -0,0 +1,74 @@
+'''
+Created on 24-12-2012
+
+@author: marcin
+'''
+import os
+import re
+
+rootpath = "."
+specfile = "pspec.xml"
+newcomment = "First release"
+newrelease = "1"
+relative_backup_path = "../backup"
+
+def read_file(path):
+    with open(path) as f:
+        return f.read().strip()
+
+def reset_history(spec):
+    release = re.compile("(.*?release\s*=\s*)[\"\']\d+[\"\'](.*?)")
+    newspec = ''
+    history = False
+    update1 = False
+    skipline = False
+    for line in spec.split("\n"):
+        if "</History>" in line: history = False
+        if "<History>" in line: history = True
+        if history:
+            if "</Update>" in line:
+                if not update1: newspec = "\n".join((newspec, line))
+                update1 = True
+            if update1: continue
+            else:
+                if "<Update" in line: line = re.sub(release, r'\1"%s"\2' % newrelease, line)
+                elif "<Comment" in line:
+                    if not "</Comment" in line:
+                        skipline = True
+                if "</Comment" in line:
+                    skipline = False
+                    line = " " * 12 + "<Comment>%s</Comment>" % newcomment
+                if not skipline: newspec = "\n".join((newspec, line))
+        else: newspec = "\n".join((newspec, line))
+    return newspec
+
+if __name__ == '__main__':
+    backup_path = os.path.normpath(os.path.join(rootpath, relative_backup_path))
+    if not os.path.isdir(backup_path):
+        os.makedirs(backup_path)
+    else:
+        suffix = 0
+        parent_backup = os.path.dirname(backup_path)
+        base_name = os.path.basename(relative_backup_path)
+        for d in os.listdir(parent_backup):
+            if d.startswith(base_name):
+                ext = d.replace(base_name, '')
+                if os.path.isdir("%s/%s" % (parent_backup, d)) and ext.isdigit():
+                    if int(ext) > suffix:
+                        suffix = int(ext)
+        suffix +=1
+        suffix = "0%d" % suffix if suffix < 10 else str(suffix)
+        os.rename(backup_path, backup_path + suffix)
+        os.makedirs(backup_path)
+ 
+    for root, dirs, files in os.walk(rootpath):
+        if specfile in files:
+            f = "%s/%s" % (root, specfile)
+            print(f)
+            spec = read_file(f)
+            bf = "%s/%s" % (os.path.normpath(root.replace(rootpath, relative_backup_path)), specfile)
+            os.makedirs(os.path.dirname(bf))
+            open(bf, "w").write(spec)
+            open(bf, "a").write("\n")
+            open(f, "w").write(reset_history(spec))
+            open(f, "a").write("\n")
@@ -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.5">kernel-module-headers</Dependency>
+            <Dependency version="4.9.6">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.5">kernel</Dependency>
+            <Dependency version="4.9.6">kernel</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="library" permanent="true">/lib/modules</Path>
@@ -34,194 +34,61 @@
    </Package>

    <History>
-          <Update release="26">
-            <Date>2015-08-13</Date>
+        <Update release="8">
+            <Date>2017-02-01</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>
-            <Comment>Rebuild for kernel-4.1.3.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="24">
-            <Date>2015-07-20</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel-4.1.2.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="23">
-            <Date>2015-07-13</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel-4.0.8.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-         <Update release="22">
-            <Date>2015-06-30</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel-4.0.7.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-          <Update release="21">
-            <Date>2015-06-24</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel-4.0.6.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-         <Update release="20">
-            <Date>2015-06-16</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for new kernel</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-       <Update release="19">
-            <Date>2015-05-22</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.19.8</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-       <Update release="18">
-            <Date>2015-05-05</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.19.6</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-       <Update release="17">
-            <Date>2015-04-24</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.19.5</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-         <Update release="16">
-            <Date>2015-04-16</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.19.4</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="15">
-            <Date>2015-04-02</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.19.3</Comment>
-            <Name>Hakan Yıldız</Name>
-            <Email>hknyldz93@gmail.com</Email>
-        </Update>
-         <Update release="14">
-            <Date>2015-03-08</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.19.1</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-         <Update release="13">
-            <Date>2015-03-01</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.19.0</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="12">
-            <Date>2015-01-28</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.18.3</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="11">
-            <Date>2015-01-09</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.18.1</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="10">
-            <Date>2014-11-29</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.17.4</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="9">
-            <Date>2014-10-18</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.17.1</Comment>
+            <Comment>Rebuild for new kernel.</Comment>
            <Name>Kamil Atlı</Name>
            <Email>suvari@pisilinux.org</Email>
        </Update>
-        <Update release="8">
-            <Date>2014-09-19</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.16.3</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
        <Update release="7">
-            <Date>2014-09-03</Date>
+            <Date>2016-12-10</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.16.1</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="6">
-            <Date>2014-07-24</Date>
+            <Date>2016-11-02</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.15.6</Comment>
-            <Name>Vedat Demir</Name>
-            <Email>vedat@pisilinux.org</Email>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="5">
-            <Date>2014-06-15</Date>
+            <Date>2016-08-24</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.15.0</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="5">
-            <Date>2014-05-29</Date>
-            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.14.4.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="4">
-            <Date>2014-05-02</Date>
+            <Date>2016-08-06</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.14.2.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="3">
-            <Date>2014-04-15</Date>
+            <Date>2016-06-28</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.13.10.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="2">
-            <Date>2014-03-29</Date>
+            <Date>2016-04-30</Date>
            <Version>0.8</Version>
-            <Comment>Rebuild for kernel 3.13.6.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="1">
-            <Date>2014-03-09</Date>
+            <Date>2016-03-07</Date>
            <Version>0.8</Version>
-            <Comment>First release.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Comment>First release</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
    </History>
-</PISI>
+</PISI>
@@ -1,6 +1,5 @@
-blacklist brcm80211
 blacklist b43
 blacklist ssb
 blacklist bcma
 blacklist brcmsmac
-blacklist brcmfmac
+blacklist brcmfmac
@@ -1,12 +0,0 @@
-diff -urN a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
--- a/src/wl/sys/wl_linux.c	2015-01-06 12:33:42.981659618 +0100
-+++ b/src/wl/sys/wl_linux.c	2015-01-06 12:34:05.647395418 +0100
-@@ -2157,8 +2157,8 @@
- 	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,11 +0,0 @@
--- a/Makefile	2014-06-26 10:42:08.000000000 +0000
-+++ b/Makefile	2014-07-17 22:44:01.662297228 +0000
-@@ -126,6 +126,8 @@
- EXTRA_CFLAGS       += -I$(src)/src/shared/bcmwifi/include
- #EXTRA_CFLAGS       += -DBCMDBG_ASSERT -DBCMDBG_ERR
- 
-+EXTRA_CFLAGS       += -Wno-date-time
-+
- EXTRA_LDFLAGS      := $(src)/lib/wlc_hybrid.o_shipped
- 
- KBASE              ?= /lib/modules/`uname -r`
@@ -1,26 +0,0 @@
--- a/src/wl/sys/wl_cfg80211_hybrid.c	2015-03-16 14:39:29.899350026 +0100
-+++ b/src/wl/sys/wl_cfg80211_hybrid.c	2015-03-16 14:39:06.732682365 +0100
-@@ -1452,7 +1452,11 @@
- 		WL_DBG(("Could not get rate (%d)\n", err));
- 	} else {
- 		rate = dtoh32(rate);
-+		#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
-+		sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE);
-+		#else
- 		sinfo->filled |= STATION_INFO_TX_BITRATE;
-+		#endif
- 		sinfo->txrate.legacy = rate * 5;
- 		WL_DBG(("Rate %d Mbps\n", (rate / 2)));
- 	}
-@@ -1465,7 +1469,11 @@
- 			return err;
- 		}
- 		rssi = dtoh32(scb_val.val);
-+		#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
-+		sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);
-+		#else
- 		sinfo->filled |= STATION_INFO_SIGNAL;
-+		#endif
- 		sinfo->signal = rssi;
- 		WL_DBG(("RSSI %d dBm\n", rssi));
- 	}
@@ -1,60 +0,0 @@
--- a/src/wl/sys/wl_cfg80211_hybrid.c	2014-06-26 12:42:08.000000000 +0200
-+++ b/src/wl/sys/wl_cfg80211_hybrid.c	2014-10-08 18:47:07.549476082 +0200
-@@ -2071,7 +2071,22 @@
- 			wl_get_assoc_ies(wl);
- 			memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
- 			wl_update_bss_info(wl);
-			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL);
-+			{
-+				struct wl_bss_info *bi;
-+				u16 bss_info_channel;
-+				struct ieee80211_channel *channel;
-+				u32 freq;
-+
-+				bi = (struct wl_bss_info *)(wl->extra_buf + 4);
-+				bss_info_channel = bi->ctl_ch ? bi->ctl_ch : CHSPEC_CHANNEL(bi->chanspec);
-+
-+				freq = ieee80211_channel_to_frequency(bss_info_channel,
-+				       (bss_info_channel <= CH_MAX_2G_CHANNEL) ?
-+				       IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
-+
-+				channel = ieee80211_get_channel(wl_to_wiphy(wl), freq);
-+				cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
-+			}
- 			set_bit(WL_STATUS_CONNECTED, &wl->status);
- 			wl->profile->active = true;
- 		}
--- a/src/wl/sys/wl_linux.c	2014-06-26 12:42:08.000000000 +0200
-+++ b/src/wl/sys/wl_linux.c	2014-10-08 18:47:19.526693719 +0200
-@@ -878,7 +878,7 @@
- static SIMPLE_DEV_PM_OPS(wl_pm_ops, wl_suspend, wl_resume);
- #endif
- 
-static struct pci_driver wl_pci_driver = {
-+static struct pci_driver wl_pci_driver __refdata = {
- 	.name =		"wl",
- 	.probe =	wl_pci_probe,
- 	.remove =	__devexit_p(wl_remove),
-@@ -1307,7 +1307,12 @@
- 	dev->priv = priv_link;
- #else
- 
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0))
- 	dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup);
-+#else
-+	dev = alloc_netdev(sizeof(priv_link_t), intf_name, NET_NAME_UNKNOWN,
-+			   ether_setup);
-+#endif
- 	if (!dev) {
- 		WL_ERROR(("wl%d: %s: alloc_netdev failed\n",
- 			(wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__));
--- a/src/wl/sys/wl_cfg80211_hybrid.c	2014-12-10 03:43:11.145810000 +0000
-+++ b/src/wl/sys/wl_cfg80211_hybrid.c	2014-12-10 03:44:37.700680960 +0000
-@@ -2010,7 +2010,7 @@
- 
- 	notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset);
- 	notify_ielen = le32_to_cpu(bi->ie_length);
-	cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet),
-+	cbss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN, (const u8 *)(bi->BSSID.octet),
- 		0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
- 		(const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
@@ -0,0 +1,109 @@
+Since Linux 4.7, the enum ieee80211_band is no longer used
+
+This shall cause no problem's since both enums ieee80211_band
+and nl80211_band were added in the same commit:
+https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=13ae75b103e07304a34ab40c9136e9f53e06475c
+
+This patch refactors the references of IEEE80211_BAND_* to NL80211_BAND_*
+
+Reference:
+https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=57fbcce37be7c1d2622b56587c10ade00e96afa3
+
+--- a/src/wl/sys/wl_cfg80211_hybrid.c	2016-06-13 11:57:36.159340297 -0500
+++ b/src/wl/sys/wl_cfg80211_hybrid.c	2016-06-13 11:58:18.442323435 -0500
+@@ -236,7 +236,7 @@
+ #endif				
+ 
+ #define CHAN2G(_channel, _freq, _flags) {			\
+-	.band			= IEEE80211_BAND_2GHZ,		\
+	.band			= NL80211_BAND_2GHZ,		\
+ 	.center_freq		= (_freq),			\
+ 	.hw_value		= (_channel),			\
+ 	.flags			= (_flags),			\
+@@ -245,7 +245,7 @@
+ }
+ 
+ #define CHAN5G(_channel, _flags) {				\
+-	.band			= IEEE80211_BAND_5GHZ,		\
+	.band			= NL80211_BAND_5GHZ,		\
+ 	.center_freq		= 5000 + (5 * (_channel)),	\
+ 	.hw_value		= (_channel),			\
+ 	.flags			= (_flags),			\
+@@ -379,7 +379,7 @@
+ };
+ 
+ static struct ieee80211_supported_band __wl_band_2ghz = {
+-	.band = IEEE80211_BAND_2GHZ,
+	.band = NL80211_BAND_2GHZ,
+ 	.channels = __wl_2ghz_channels,
+ 	.n_channels = ARRAY_SIZE(__wl_2ghz_channels),
+ 	.bitrates = wl_g_rates,
+@@ -387,7 +387,7 @@
+ };
+ 
+ static struct ieee80211_supported_band __wl_band_5ghz_a = {
+-	.band = IEEE80211_BAND_5GHZ,
+	.band = NL80211_BAND_5GHZ,
+ 	.channels = __wl_5ghz_a_channels,
+ 	.n_channels = ARRAY_SIZE(__wl_5ghz_a_channels),
+ 	.bitrates = wl_a_rates,
+@@ -395,7 +395,7 @@
+ };
+ 
+ static struct ieee80211_supported_band __wl_band_5ghz_n = {
+-	.band = IEEE80211_BAND_5GHZ,
+	.band = NL80211_BAND_5GHZ,
+ 	.channels = __wl_5ghz_n_channels,
+ 	.n_channels = ARRAY_SIZE(__wl_5ghz_n_channels),
+ 	.bitrates = wl_a_rates,
+@@ -1876,8 +1876,8 @@
+ 	wdev->wiphy->max_num_pmkids = WL_NUM_PMKIDS_MAX;
+ #endif
+ 	wdev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
+-	wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = &__wl_band_2ghz;
+-	wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_a; 
+	wdev->wiphy->bands[NL80211_BAND_2GHZ] = &__wl_band_2ghz;
+	wdev->wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_a; 
+ 	wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
+ 	wdev->wiphy->cipher_suites = __wl_cipher_suites;
+ 	wdev->wiphy->n_cipher_suites = ARRAY_SIZE(__wl_cipher_suites);
+@@ -2000,7 +2000,7 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)
+ 	freq = ieee80211_channel_to_frequency(notif_bss_info->channel,
+ 		(notif_bss_info->channel <= CH_MAX_2G_CHANNEL) ?
+-		IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
+		NL80211_BAND_2GHZ : NL80211_BAND_5GHZ);
+ #else
+ 	freq = ieee80211_channel_to_frequency(notif_bss_info->channel);
+ #endif
+@@ -2116,7 +2116,7 @@
+ 				return err;
+ 			}
+ 			chan = wf_chspec_ctlchan(chanspec);
+-			band = (chan <= CH_MAX_2G_CHANNEL) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
+			band = (chan <= CH_MAX_2G_CHANNEL) ? NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;
+ 			freq = ieee80211_channel_to_frequency(chan, band);
+ 			channel = ieee80211_get_channel(wiphy, freq);
+ 			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
+@@ -2250,10 +2250,10 @@
+ 		join_params->params.chanspec_list[0] =
+ 		    ieee80211_frequency_to_channel(chan->center_freq);
+ 
+-		if (chan->band == IEEE80211_BAND_2GHZ) {
+		if (chan->band == NL80211_BAND_2GHZ) {
+ 			chanspec |= WL_CHANSPEC_BAND_2G;
+ 		}
+-		else if (chan->band == IEEE80211_BAND_5GHZ) {
+		else if (chan->band == NL80211_BAND_5GHZ) {
+ 			chanspec |= WL_CHANSPEC_BAND_5G;
+ 		}
+ 		else {
+@@ -2885,7 +2885,7 @@
+ 
+ 	if (phy == 'n' || phy == 'a' || phy == 'v') {
+ 		wiphy = wl_to_wiphy(wl);
+-		wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_n;
+		wiphy->bands[NL80211_BAND_5GHZ] = &__wl_band_5ghz_n;
+ 	}
+ 
+ 	return err;
@@ -0,0 +1,52 @@
+Reference: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=839629
+
+--- a/src/wl/sys/wl_cfg80211_hybrid.c	2016-10-03 10:53:55.588036464 +0200
+++ b/src/wl/sys/wl_cfg80211_hybrid.c	2016-10-03 10:54:11.911695944 +0200
+@@ -2386,8 +2386,15 @@
+ 	s32 err = 0;
+ 
+ 	if (wl->scan_request) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
+		struct cfg80211_scan_info info = {
+			.aborted = true
+		};
+ 		WL_DBG(("%s: Aborting scan\n", __FUNCTION__));
+-		cfg80211_scan_done(wl->scan_request, true);     
+		cfg80211_scan_done(wl->scan_request, &info);
+#else
+		cfg80211_scan_done(wl->scan_request, true);
+#endif
+ 		wl->scan_request = NULL;
+ 	}
+ 
+@@ -2488,7 +2495,14 @@
+ 
+ scan_done_out:
+ 	if (wl->scan_request) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
+		struct cfg80211_scan_info info = {
+			.aborted = false
+		};
+		cfg80211_scan_done(wl->scan_request, &info);
+#else
+ 		cfg80211_scan_done(wl->scan_request, false);
+#endif
+ 		wl->scan_request = NULL;
+ 	}
+ 	rtnl_unlock();
+@@ -2913,7 +2927,14 @@
+ 	s32 err = 0;
+ 
+ 	if (wl->scan_request) {
+-		cfg80211_scan_done(wl->scan_request, true);	
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
+		struct cfg80211_scan_info info = {
+			.aborted = true
+		};
+		cfg80211_scan_done(wl->scan_request, &info);
+#else
+		cfg80211_scan_done(wl->scan_request, true);
+#endif
+ 		wl->scan_request = NULL;
+ 	}
+ 
@@ -0,0 +1,14 @@
+diff --git a/src/wl/sys/wl_linux.c.orig b/src/wl/sys/wl_linux.c
+index eb00717..489c9f5 100644
+--- a/src/wl/sys/wl_linux.c.orig
+++ b/src/wl/sys/wl_linux.c
+@@ -2166,8 +2166,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,11 +0,0 @@
-diff -urN a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
--- a/src/wl/sys/wl_linux.c	2013-08-01 09:52:22.000000000 +0300
-+++ b/src/wl/sys/wl_linux.c	2013-09-27 09:20:11.495023471 +0300
-@@ -235,7 +235,7 @@
- #define to_str(s) #s
- #define quote_str(s) to_str(s)
- 
-#define BRCM_WLAN_IFNAME eth%d
-+#define BRCM_WLAN_IFNAME wlan%d
- 
- static char intf_name[IFNAMSIZ] = quote_str(BRCM_WLAN_IFNAME); 
@@ -5,37 +5,32 @@
        <Name>module-broadcom-wl</Name>
        <Homepage>http://www.broadcom.com/support/802.11/linux_sta.php</Homepage>
        <Packager>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Packager>
        <License>freedist</License>
        <IsA>driver</IsA>
        <Summary>Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver for use with Broadcom's BCM4311, BCM4312, BCM4321, and BCM4322 based hardware</Summary>
        <Description>This package contains Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver for use with Broadcom's BCM4311, BCM4312, BCM4321, and BCM4322 based hardware. You must read the LICENSE.txt file in the docs directory before using this software.</Description>
-        <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>
+        <Archive sha1sum="8acbdbb4ab4ab4123d1773b616904798fbef9277" type="targz" target="i686">https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz</Archive>
+        <Archive sha1sum="1f568bb989d175813c5631c6629d9479eae6f3be" type="targz" target="x86_64">https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz</Archive>
        <BuildDependencies>
-            <Dependency version="4.1.5">kernel-module-headers</Dependency>
+            <Dependency version="4.9.6">kernel-module-headers</Dependency>
        </BuildDependencies>
        <Patches>
-            <Patch level="1">patch/linux-40.patch</Patch>
-            <Patch level="1">patch/linux-recent.patch</Patch>
            <Patch level="1">patch/license.patch</Patch>
-            <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 level="1">patch/wl_linux.c.patch</Patch>
+            <Patch level="1">patch/linux47.patch</Patch>
+            <Patch level="1">patch/linux48.patch</Patch>
        </Patches>
    </Source>

    <Package>
        <Name>module-broadcom-wl</Name>
        <RuntimeDependencies>
-            <Dependency version="4.1.5">kernel</Dependency>
+            <Dependency version="4.9.6">kernel</Dependency>
            <Dependency release="current">module-broadcom-wl-userspace</Dependency>
        </RuntimeDependencies>
-        <Replaces>
-            <Package>broadcom-wl</Package>
-        </Replaces>
        <Files>
            <Path fileType="library" permanent="true">/lib/modules</Path>
        </Files>
@@ -62,327 +57,61 @@
    </Package>

    <History>
-          <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>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="44">
-            <Date>2015-07-20</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 4.1.2.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="43">
-            <Date>2015-07-13</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 4.0.8.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="42">
-            <Date>2015-06-30</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 4.0.7.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="41">
-            <Date>2015-06-16</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 4.0.6</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="40">
-            <Date>2015-06-16</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 4.0.5</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="38">
-            <Date>2015-05-22</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.19.6</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="37">
-            <Date>2015-05-05</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.19.6</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="36">
-            <Date>2015-04-24</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.19.5</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="35">
-            <Date>2015-04-16</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.19.4</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="34">
-            <Date>2015-04-02</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.19.3</Comment>
-            <Name>Hakan Yıldız</Name>
-            <Email>hknyldz93@gmail.com</Email>
-        </Update>
-        <Update release="33">
-            <Date>2015-03-08</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.19.1</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="32">
-            <Date>2015-03-01</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.19.0</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="31">
-            <Date>2015-02-28</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.18.3</Comment>
-            <Name>Hakan Yıldız</Name>
-            <Email>hknyldz93@gmail.com</Email>
-        </Update>
-        <Update release="30">
-            <Date>2014-11-29</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.17.4</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="29">
-            <Date>2014-10-19</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.17.1</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="28">
-            <Date>2014-09-19</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.16.3</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="27">
-            <Date>2014-09-03</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Rebuild for kernel 3.16.1</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="26">
-            <Date>2014-07-23</Date>
-            <Version>6.30.223.248</Version>
-            <Comment>Version bump for kernel 3.15.6</Comment>
-            <Name>Vedat Demir</Name>
-            <Email>vedat@pisilinux.org</Email>
-        </Update>
-        <Update release="25">
-            <Date>2014-06-15</Date>
-            <Version>6.30.223.141</Version>
-            <Comment>Rebuild for kernel 3.15.0</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="24">
-            <Date>2014-05-29</Date>
-            <Version>6.30.223.141</Version>
-            <Comment>Rebuild for kernel 3.14.4.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="23">
-            <Date>2014-05-02</Date>
-            <Version>6.30.223.141</Version>
-            <Comment>Rebuild for kernel 3.14.2.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="22">
-            <Date>2014-04-15</Date>
-            <Version>6.30.223.141</Version>
-            <Comment>Rebuild for kernel 3.13.10.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="21">
-            <Date>2014-03-29</Date>
-            <Version>6.30.223.141</Version>
-            <Comment>Rebuild for 3.13.6</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
-        </Update>
-        <Update release="20">
-            <Date>2014-03-01</Date>
-            <Version>6.30.223.141</Version>
-            <Comment>Rebuild for 3.12.13</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-         <Update release="19">
-            <Date>2014-01-17</Date>
-            <Version>6.30.223.141</Version>
-            <Comment>Rebuild for 3.12.8</Comment>
-            <Name>Yusuf Aydemir</Name>
-            <Email>yusuf.aydemir@pisilinux.org</Email>
-        </Update>
-        <Update release="18">
-            <Date>2013-12-17</Date>
-            <Version>6.30.223.141</Version>
-            <Comment>Rebuild for 3.12.5</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="17">
-            <Date>2013-12-14</Date>
-            <Version>6.30.223.141</Version>
-            <Comment>Rebuild for 3.12.5</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="16">
-            <Date>2013-11-23</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>Rebuild for 3.10.20</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="15">
-            <Date>2013-11-05</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>Rebuild for 3.10.18</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="14">
-            <Date>2013-10-09</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>fix solution broadcom-wl</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
-        </Update>
-        <Update release="13">
-            <Date>2013-09-28</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>fix solution broadcom-wl</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
-        </Update>
-        <Update release="12">
-            <Date>2013-09-18</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>fix solution broadcom-wl</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
-        </Update>
-        <Update release="11">
-            <Date>2013-09-05</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>fix solution broadcom-wl</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
-        </Update>
-        <Update release="10">
-            <Date>2013-08-30</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>3.10.10</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
-        </Update>
-        <Update release="10">
-            <Date>2013-08-20</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>3.10.9</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
-        </Update>
-        <Update release="9">
-            <Date>2013-08-20</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>3.10.x</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
-        </Update>
        <Update release="8">
-            <Date>2013-08-11</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>without blacklist</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2017-02-01</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild for kernel 4.9.6.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="7">
-            <Date>2013-07-26</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>Rebuild for Kernel 3.10.x</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2017-01-08</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Fix url and add patch.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="6">
-            <Date>2013-06-15</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>rebuild for Kernel 3.8.13</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-12-10</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="5">
-            <Date>2013-05-26</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>rebuild for Kernel 3.9.4</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-11-02</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="4">
-            <Date>2013-05-26</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>Kernel 3.9.3</Comment>
+            <Date>2016-08-24</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild for new kernel.</Comment>
            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="3">
-            <Date>2013-02-07</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>Runtime dep</Comment>
-            <Name>Ertan Güven</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Date>2016-08-06</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="2">
-            <Date>2013-02-01</Date>
-            <Version>5.100.82.112</Version>
-            <Comment>bump+fix for new kernel-line</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Date>2016-05-23</Date>
+            <Version>6.30.223.248</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="1">
-            <Date>2011-09-15</Date>
-            <Version>5.100.82.38</Version>
+            <Date>2016-03-07</Date>
+            <Version>6.30.223.248</Version>
            <Comment>First release</Comment>
-            <Name>Pisi Linux Admins</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
    </History>
 </PISI>
@@ -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="87b355193a306ed5516e8d348f7eb83854e08ac1" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-guest-5.1.14.tar.xz</Archive>
        <BuildDependencies>
-            <Dependency version="4.1.5">kernel-module-headers</Dependency>
+            <Dependency version="4.9.6">kernel-module-headers</Dependency>
        </BuildDependencies>
    </Source>

    <Package>
        <Name>module-virtualbox-guest</Name>
        <RuntimeDependencies>
-            <Dependency version="4.1.5">kernel</Dependency>
+            <Dependency version="4.9.6">kernel</Dependency>
            <Dependency>baselayout</Dependency>
            <Dependency version="current">module-virtualbox-guest-userspace</Dependency>
        </RuntimeDependencies>
@@ -52,348 +52,103 @@
    </Package>

    <History>
-        <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">
-            <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">
-            <Date>2015-07-13</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.0.8.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="45">
-            <Date>2015-06-24</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.0.7.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="44">
-            <Date>2015-06-24</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.0.6.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="43">
-            <Date>2015-06-09</Date>
-            <Version>4.3.28</Version>
-            <Comment>Version Bump.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-          <Update release="42">
-            <Date>2015-05-14</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.8</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="41">
-            <Date>2015-05-05</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.6</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-         <Update release="40">
-            <Date>2015-04-24</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.5</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-         <Update release="39">
-            <Date>2015-04-16</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.4</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-	<Update release="38">
-            <Date>2015-04-02</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.3</Comment>
-            <Name>Hakan Yıldız</Name>
-            <Email>hknyldz93@gmail.com</Email>
-        </Update>
-        <Update release="37">
-            <Date>2015-03-08</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.1</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="36">
-            <Date>2015-03-01</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.0</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="35">
-            <Date>2015-01-28</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.18.3</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="34">
-            <Date>2015-01-09</Date>
-            <Version>4.3.20</Version>
-            <Comment>Version bump, kernel 3.18.1</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="33">
-            <Date>2014-11-29</Date>
-            <Version>4.3.18</Version>
-            <Comment>Version bump, kernel 3.17.4</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="32">
-            <Date>2014-10-19</Date>
-            <Version>4.3.18</Version>
-            <Comment>Version bump, kernel 3.17.1</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="31">
-            <Date>2014-09-19</Date>
-            <Version>4.3.16</Version>
-            <Comment>Version bump, kernel 3.16.3</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="30">
-            <Date>2014-09-03</Date>
-            <Version>4.3.14</Version>
-            <Comment>Rebuild for kernel 3.16.1</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="29">
-            <Date>2014-07-24</Date>
-            <Version>4.3.14</Version>
-            <Comment>Version bump for kernel 3.15.6</Comment>
-            <Name>Vedat Demir</Name>
-            <Email>vedatn@pisilinux.org</Email>
-        </Update>
-        <Update release="28">
-            <Date>2014-06-15</Date>
-            <Version>4.3.10</Version>
-            <Comment>Rebuild for kernel 3.15.0</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="27">
-            <Date>2014-05-29</Date>
-            <Version>4.3.10</Version>
-            <Comment>Rebuild for kernel 3.14.4.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="26">
-            <Date>2014-05-02</Date>
-            <Version>4.3.10</Version>
-            <Comment>Rebuild for kernel 3.14.2.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="25">
-            <Date>2014-04-15</Date>
-            <Version>4.3.10</Version>
-            <Comment>Rebuild for kernel 3.13.10.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="24">
-            <Date>2014-04-07</Date>
-            <Version>4.3.10</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
-        </Update>
-        <Update release="23">
-            <Date>2014-03-29</Date>
-            <Version>4.3.8</Version>
-            <Comment>Rebuild for 3.13.6</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
-        </Update>
-        <Update release="22">
-            <Date>2014-03-09</Date>
-            <Version>4.3.8</Version>
-            <Comment>Rebuild for 3.12.13</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
-        </Update>
-        <Update release="21">
-            <Date>2014-03-01</Date>
-            <Version>4.3.8</Version>
-            <Comment>Rebuild for 3.12.13</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
-        </Update>
-        <Update release="20">
-            <Date>2014-01-17</Date>
-            <Version>4.3.6</Version>
-            <Comment>Rebuild for 3.12.8</Comment>
-            <Name>Yusuf Aydemir</Name>
-            <Email>yusuf.aydemir@pisilinux.org</Email>
-        </Update>
-        <Update release="19">
-            <Date>2013-12-21</Date>
-            <Version>4.3.6</Version>
-            <Comment>Version bump</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="18">
-            <Date>2013-12-17</Date>
-            <Version>4.3.2</Version>
-            <Comment>Rebuild for 3.12.5</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="17">
-            <Date>2013-12-12</Date>
-            <Version>4.3.2</Version>
-            <Comment>Rebuild for 3.12.5</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="16">
-            <Date>2013-11-23</Date>
-            <Version>4.3.2</Version>
-            <Comment>Rebuild for 3.10.20</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="15">
-            <Date>2013-11-11</Date>
-            <Version>4.3.2</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
        <Update release="14">
-            <Date>2013-11-05</Date>
-            <Version>4.2.18</Version>
-            <Comment>Rebuild for 3.10.18</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2017-02-01</Date>
+            <Version>5.1.14</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="13">
-            <Date>2013-10-10</Date>
-            <Version>4.2.18</Version>
-            <Comment>version bump</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2017-01-15</Date>
+            <Version>5.1.12</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="12">
-            <Date>2013-09-28</Date>
-            <Version>4.2.16</Version>
-            <Comment>3.10.13</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-12-13</Date>
+            <Version>5.1.10</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
        </Update>
        <Update release="11">
-            <Date>2013-09-18</Date>
-            <Version>4.2.16</Version>
-            <Comment>3.10.12</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-12-10</Date>
+            <Version>5.1.6</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="10">
-            <Date>2013-08-30</Date>
-            <Version>4.2.16</Version>
-            <Comment>3.10.10</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-11-02</Date>
+            <Version>5.1.6</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="9">
-            <Date>2013-08-20</Date>
-            <Version>4.2.16</Version>
-            <Comment>3.10.9</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-09-26</Date>
+            <Version>5.1.6</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
        </Update>
        <Update release="8">
-            <Date>2013-08-20</Date>
-            <Version>4.2.16</Version>
-            <Comment>Kernel 3.10.6</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-08-24</Date>
+            <Version>5.1.4</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="7">
-            <Date>2013-07-06</Date>
-            <Version>4.2.16</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2016-08-17</Date>
+            <Version>5.1.4</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
        </Update>
        <Update release="6">
-            <Date>2013-06-01</Date>
-            <Version>4.2.12</Version>
-            <Comment>Kernel 3.8.13</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-08-06</Date>
+            <Version>5.1.2</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="5">
-            <Date>2013-06-01</Date>
-            <Version>4.2.12</Version>
-            <Comment>Kernel 3.9.4</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-07-22</Date>
+            <Version>5.1.2</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
        </Update>
        <Update release="4">
-            <Date>2013-05-04</Date>
-            <Version>4.2.12</Version>
-            <Comment>Update</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2016-06-17</Date>
+            <Version>5.1.0</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
        </Update>
        <Update release="3">
-            <Date>2013-04-14</Date>
-            <Version>4.2.12</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2016-06-17</Date>
+            <Version>5.1.0b</Version>
+            <Comment>Version Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="2">
-            <Date>2013-03-02</Date>
-            <Version>4.2.8</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2016-04-27</Date>
+            <Version>5.0.12</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="1">
-            <Date>2013-01-22</Date>
-            <Version>4.2.6</Version>
+            <Date>2016-03-07</Date>
+            <Version>5.0.12</Version>
            <Comment>First release</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
    </History>
-</PISI>
+</PISI>
@@ -0,0 +1,39 @@
+#
+# https://forums.virtualbox.org/viewtopic.php?uid=80969&f=7&t=70150&start=0
+# kernel 4.3-rc1 heads up
+#
+--- ./vboxdrv/linux/SUPDrv-linux.c.orig	2015-09-25 20:56:04.704532570 -0700
+++ ./vboxdrv/linux/SUPDrv-linux.c	2015-09-25 20:57:17.265521751 -0700
+@@ -485,6 +485,7 @@
+      * opened, at least we'll blindly assume that here.
+      */
+ #ifdef CONFIG_VBOXDRV_AS_MISC
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
+     rc = misc_deregister(&gMiscDeviceUsr);
+     if (rc < 0)
+     {
+@@ -495,6 +496,10 @@
+     {
+         Log(("misc_deregister failed with rc=%#x on vboxdrv\n", rc));
+     }
+#else
+    misc_deregister(&gMiscDeviceUsr);
+    misc_deregister(&gMiscDeviceSys);
+#endif
+ #else  /* !CONFIG_VBOXDRV_AS_MISC */
+ # ifdef CONFIG_DEVFS_FS
+     /*
+--- ./vboxnetadp/linux/VBoxNetAdp-linux.c.orig	2015-09-25 20:55:42.309667865 -0700
+++ ./vboxnetadp/linux/VBoxNetAdp-linux.c	2015-09-25 20:58:49.331034237 -0700
+@@ -436,7 +436,11 @@
+ 
+     vboxNetAdpShutdown();
+     /* Remove control device */
+    #if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
+     rc = misc_deregister(&g_CtlDev);
+    #else
+        misc_deregister(&g_CtlDev);
+    #endif
+     if (rc < 0)
+     {
+         printk(KERN_ERR "misc_deregister failed with rc=%x\n", rc);
@@ -12,16 +12,19 @@
        <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="7489ae3b501407d5ca2826e6ef1d5b2000e06154" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-5.1.14.tar.xz</Archive>
        <BuildDependencies>
-            <Dependency version="4.1.5">kernel-module-headers</Dependency>
+            <Dependency version="4.9.6">kernel-module-headers</Dependency>
        </BuildDependencies>
+        <!--Patches>
+            <Patch>vbox_linux-4.3.diff</Patch>
+        </Patches-->
    </Source>

    <Package>
        <Name>module-virtualbox</Name>
        <RuntimeDependencies>
-            <Dependency version="4.1.5">kernel</Dependency>
+            <Dependency version="4.9.6">kernel</Dependency>
            <Dependency version="current">module-virtualbox-userspace</Dependency>
        </RuntimeDependencies>
        <Files>
@@ -47,362 +50,103 @@
    </Package>

    <History>
-         <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">
-            <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">
-            <Date>2015-07-13</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.0.8.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-          <Update release="46">
-            <Date>2015-06-30</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.0.7.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-          <Update release="45">
-            <Date>2015-06-24</Date>
-            <Version>4.3.28</Version>
-            <Comment>Rebuild for kernel-4.0.6.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-          <Update release="44">
-            <Date>2015-06-09</Date>
-            <Version>4.3.28</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-          <Update release="43">
-            <Date>2015-05-14</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.8</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-          <Update release="42">
-            <Date>2015-05-05</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.6</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-          <Update release="41">
-            <Date>2015-04-24</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.5</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-          <Update release="40">
-            <Date>2015-04-16</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.4</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-         </Update>
-         <Update release="39">
-            <Date>2015-04-02</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.3</Comment>
-            <Name>Hakan Yıldız</Name>
-            <Email>hknyldz93@gmail.com</Email>
-        </Update>
-        <Update release="38">
-            <Date>2015-03-08</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.1</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-	  </Update>
-        <Update release="37">
-            <Date>2015-03-01</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.19.0</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="36">
-            <Date>2015-01-28</Date>
-            <Version>4.3.20</Version>
-            <Comment>Rebuild for kernel 3.18.3</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="35">
-            <Date>2015-01-09</Date>
-            <Version>4.3.20</Version>
-            <Comment>Version bump, kernel 3.18.1</Comment>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
-        </Update>
-        <Update release="34">
-            <Date>2014-11-29</Date>
-            <Version>4.3.18</Version>
-            <Comment>Rebuild</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="33">
-            <Date>2014-11-21</Date>
-            <Version>4.3.18</Version>
-            <Comment>Rebuild</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="32">
-            <Date>2014-10-19</Date>
-            <Version>4.3.18</Version>
-            <Comment>Version bump, 4.3.18</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="31">
-            <Date>2014-09-19</Date>
-            <Version>4.3.16</Version>
-            <Comment>Version bump, 4.3.16</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="30">
-            <Date>2014-09-03</Date>
-            <Version>4.3.14</Version>
-            <Comment>Rebuild for kernel 3.16.1</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="29">
-            <Date>2014-07-24</Date>
-            <Version>4.3.14</Version>
-            <Comment>Version bump for kernel 3.15.6</Comment>
-            <Name>Vedat Demir</Name>
-            <Email>vedat@pisilinux.org</Email>
-        </Update>
-        <Update release="28">
-            <Date>2014-06-15</Date>
-            <Version>4.3.10</Version>
-            <Comment>Rebuild for kernel 3.15.0</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="27">
-            <Date>2014-05-29</Date>
-            <Version>4.3.10</Version>
-            <Comment>Rebuild for kernel 3.14.4.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="26">
-            <Date>2014-05-02</Date>
-            <Version>4.3.10</Version>
-            <Comment>Rebuild for kernel 3.14.2.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="25">
-            <Date>2014-04-15</Date>
-            <Version>4.3.10</Version>
-            <Comment>Rebuild for kernel 3.13.10.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="24">
-            <Date>2014-04-07</Date>
-            <Version>4.3.10</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
-        </Update>
-        <Update release="23">
-            <Date>2014-03-29</Date>
-            <Version>4.3.8</Version>
-            <Comment>Rebuild for 3.13.6</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="22">
-            <Date>2014-03-09</Date>
-            <Version>4.3.8</Version>
-            <Comment>Rebuild for 3.12.13</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
-        </Update>
-        <Update release="21">
-            <Date>2014-03-01</Date>
-            <Version>4.3.8</Version>
-            <Comment>Rebuild for 3.12.13</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
-        </Update>
-        <Update release="20">
-            <Date>2014-01-17</Date>
-            <Version>4.3.6</Version>
-            <Comment>Rebuild for 3.12.8</Comment>
-            <Name>Yusuf Aydemir</Name>
-            <Email>yusuf.aydemir@pisilinux.org</Email>
-        </Update>
-        <Update release="19">
-            <Date>2013-12-22</Date>
-            <Version>4.3.6</Version>
-            <Comment>Version bump</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="18">
-            <Date>2013-12-17</Date>
-            <Version>4.3.2</Version>
-            <Comment>Rebuild for 3.12.5</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="17">
-            <Date>2013-12-12</Date>
-            <Version>4.3.2</Version>
-            <Comment>Rebuild for 3.12.5</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="16">
-            <Date>2013-11-23</Date>
-            <Version>4.3.2</Version>
-            <Comment>Rebuild for 3.10.20</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
-        <Update release="15">
-            <Date>2013-11-11</Date>
-            <Version>4.3.2</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
-        </Update>
        <Update release="14">
-            <Date>2013-11-05</Date>
-            <Version>4.2.18</Version>
-            <Comment>Rebuild for 3.10.18</Comment>
-            <Name>Serdar Soytetir</Name>
-            <Email>kaptan@pisilinux.org</Email>
+            <Date>2017-02-01</Date>
+            <Version>5.1.14</Version>
+            <Comment>Version bump</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="13">
-            <Date>2013-10-09</Date>
-            <Version>4.2.18</Version>
-            <Comment>version bump</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2017-01-15</Date>
+            <Version>5.1.12</Version>
+            <Comment>Version bump</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
        </Update>
        <Update release="12">
-            <Date>2013-09-28</Date>
-            <Version>4.2.16</Version>
-            <Comment>3.10.13</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-12-13</Date>
+            <Version>5.1.10</Version>
+            <Comment>Version bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
        </Update>
        <Update release="11">
-            <Date>2013-09-18</Date>
-            <Version>4.2.16</Version>
-            <Comment>3.10.12</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-12-10</Date>
+            <Version>5.1.6</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="10">
-            <Date>2013-08-20</Date>
-            <Version>4.2.16</Version>
-            <Comment>3.10.10</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
-        </Update>
-        <Update release="10">
-            <Date>2013-08-20</Date>
-            <Version>4.2.16</Version>
-            <Comment>3.10.9</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-11-02</Date>
+            <Version>5.1.6</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="9">
-            <Date>2013-08-20</Date>
-            <Version>4.2.16</Version>
-            <Comment>Kernel 3.10.6</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-09-26</Date>
+            <Version>5.1.6</Version>
+            <Comment>Version bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
        </Update>
        <Update release="8">
-            <Date>2013-07-06</Date>
-            <Version>4.2.16</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2016-08-24</Date>
+            <Version>5.1.4</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="7">
-            <Date>2013-06-15</Date>
-            <Version>4.2.12</Version>
-            <Comment>Kernel 3.8.13</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-08-17</Date>
+            <Version>5.1.4</Version>
+            <Comment>Version bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
        </Update>
        <Update release="6">
-            <Date>2013-06-01</Date>
-            <Version>4.2.12</Version>
-            <Comment>Kernel 3.9.4</Comment>
-            <Name>Erdinç Gültekin</Name>
-            <Email>erdincgultekin@pisilinux.org</Email>
+            <Date>2016-08-06</Date>
+            <Version>5.1.2</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
        <Update release="5">
-            <Date>2013-05-26</Date>
-            <Version>4.2.12</Version>
-            <Comment>Kernel 3.9.3</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Date>2016-07-22</Date>
+            <Version>5.1.2</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
        </Update>
        <Update release="4">
-            <Date>2013-05-04</Date>
-            <Version>4.2.12</Version>
-            <Comment>Update</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2016-06-17</Date>
+            <Version>5.1.0</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
        </Update>
        <Update release="3">
-            <Date>2013-04-14</Date>
-            <Version>4.2.12</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2016-06-17</Date>
+            <Version>5.1.0b</Version>
+            <Comment>Version Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="2">
-            <Date>2013-03-02</Date>
-            <Version>4.2.8</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Date>2016-04-27</Date>
+            <Version>5.0.12</Version>
+            <Comment>Release Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
        </Update>
        <Update release="1">
-            <Date>2013-01-22</Date>
-            <Version>4.2.6</Version>
+            <Date>2016-03-07</Date>
+            <Version>5.0.12</Version>
            <Comment>First release</Comment>
-            <Name>Marcin Bojara</Name>
-            <Email>marcin@pisilinux.org</Email>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
    </History>
-</PISI>
+</PISI>
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <PISI>
    <Source>
-        <Name>module-virtualbox-modules</Name>
+        <Name>module-virtualbox</Name>
        <Summary xml:lang="tr">VirtualBox için çekirdek modülleri</Summary>
        <Description xml:lang="tr">Bu paket VirtualBox için çekirdek desteği sunar.</Description>
    </Source>
@@ -13,8 +13,6 @@ from pisi.actionsapi import get
 KDIR = kerneltools.getKernelVersion()

 def build():
-    shelltools.system("patch -p1 < ndiswrapper-1.59.patch")
-
    autotools.make("-C driver KVERS_UNAME=%s" % KDIR)

    autotools.make("-C utils")
@@ -1,41 +0,0 @@
-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;
@@ -0,0 +1,100 @@
+diff -Nuar ndiswrapper-1.60.orig/ChangeLog ndiswrapper-1.60/ChangeLog
+--- ndiswrapper-1.60.orig/ChangeLog	2016-07-27 19:05:10.594950240 +0300
+++ ndiswrapper-1.60/ChangeLog	2016-07-27 19:06:04.678949272 +0300
+@@ -1,7 +1,3 @@
+-Version 1.60 2016-05-01
+-=======================
+-* Support for Linux kernel up to 4.5
+-
+ Version 1.59 2013-11-28
+ =======================
+ * Support for Linux kernels from 2.6.13 to 3.12
+diff -Nuar ndiswrapper-1.60.orig/driver/.gitignore ndiswrapper-1.60/driver/.gitignore
+--- ndiswrapper-1.60.orig/driver/.gitignore	1970-01-01 02:00:00.000000000 +0200
+++ ndiswrapper-1.60/driver/.gitignore	2016-07-27 19:06:04.678949272 +0300
+@@ -0,0 +1,11 @@
+*.ko
+*.mod.c
+*.o
+.*.cmd
+*_exports.h
+/.tmp_versions/
+/Module.markers
+/Module.symvers
+/modules.order
+/ndis_exports.h
+/win2lin_stubs.h
+diff -Nuar ndiswrapper-1.60.orig/driver/loader.h ndiswrapper-1.60/driver/loader.h
+--- ndiswrapper-1.60.orig/driver/loader.h	2016-07-27 19:05:10.593950240 +0300
+++ ndiswrapper-1.60/driver/loader.h	2016-07-27 19:06:09.795949180 +0300
+@@ -16,10 +16,6 @@
+ #ifndef _LOADER_H_
+ #define _LOADER_H_
+ 
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(4,0,0)
+-#include <linux/vmalloc.h>
+-#endif
+-
+ #include "ndiswrapper.h"
+ 
+ #ifndef __KERNEL__
+diff -Nuar ndiswrapper-1.60.orig/driver/ntoskernel.h ndiswrapper-1.60/driver/ntoskernel.h
+--- ndiswrapper-1.60.orig/driver/ntoskernel.h	2016-07-27 19:05:10.593950240 +0300
+++ ndiswrapper-1.60/driver/ntoskernel.h	2016-07-27 19:06:13.834949108 +0300
+@@ -46,6 +46,8 @@
+ #include <linux/percpu.h>
+ #include <linux/kthread.h>
+ #include <linux/workqueue.h>
+#include <linux/vmalloc.h>
+
+ 
+ #if !defined(CONFIG_X86) && !defined(CONFIG_X86_64)
+ #error "this module is for x86 or x86_64 architectures only"
+@@ -358,8 +360,18 @@
+ #define prandom_seed(seed) net_srandom(seed)
+ #endif
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
+-#define strncasecmp strnicmp
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
+static int strncasecmp(const char *s1, const char *s2, size_t n)
+{
+	strnicmp(s1, s2, n);
+}
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
+static inline void netif_trans_update(struct net_device *dev)
+{
+	dev->trans_start = jiffies;
+}
+ #endif
+ 
+ /* TICK is 100ns */
+diff -Nuar ndiswrapper-1.60.orig/driver/wrapndis.c ndiswrapper-1.60/driver/wrapndis.c
+--- ndiswrapper-1.60.orig/driver/wrapndis.c	2016-07-27 19:05:10.593950240 +0300
+++ ndiswrapper-1.60/driver/wrapndis.c	2016-07-27 19:06:23.295948938 +0300
+@@ -704,7 +704,7 @@
+ 			n = wnd->max_tx_packets;
+ 		n = mp_tx_packets(wnd, wnd->tx_ring_start, n);
+ 		if (n) {
+-			wnd->net_dev->trans_start = jiffies;
+			netif_trans_update(wnd->net_dev);
+ 			wnd->tx_ring_start =
+ 				(wnd->tx_ring_start + n) % TX_RING_SIZE;
+ 			wnd->is_tx_ring_full = 0;
+diff -Nuar ndiswrapper-1.60.orig/ndiswrapper.spec ndiswrapper-1.60/ndiswrapper.spec
+--- ndiswrapper-1.60.orig/ndiswrapper.spec	2016-07-27 19:05:10.594950240 +0300
+++ ndiswrapper-1.60/ndiswrapper.spec	2016-07-27 19:06:28.472948846 +0300
+@@ -1,5 +1,5 @@
+ # Define ndiswrapper_version only if it is not already defined.
+-%{!?ndiswrapper_version: %define ndiswrapper_version 1.60}
+%{!?ndiswrapper_version: %define ndiswrapper_version svn}
+ %{!?ndiswrapper_release: %define ndiswrapper_release 1}
+ 
+ # Define kernel version if not already defined
+diff -Nuar ndiswrapper-1.60.orig/utils/.gitignore ndiswrapper-1.60/utils/.gitignore
+--- ndiswrapper-1.60.orig/utils/.gitignore	1970-01-01 02:00:00.000000000 +0200
+++ ndiswrapper-1.60/utils/.gitignore	2016-07-27 19:06:29.224948832 +0300
+@@ -0,0 +1 @@
+/loadndisdriver
@@ -13,22 +13,19 @@
        <IsA>driver</IsA>
        <Summary>A network driver wrapper</Summary>
        <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>
+        <Archive sha1sum="20998237cf6d37b86391dc8736c10031110db578" type="targz">http://download.sourceforge.net/ndiswrapper/ndiswrapper-1.60.tar.gz</Archive>
        <BuildDependencies>
-             <Dependency version="4.1.5">kernel-module-headers</Dependency>
+             <Dependency version="4.9.6">kernel-module-headers</Dependency>
        </BuildDependencies>
        <Patches>
-            <Patch>support_kernel-4.0.patch</Patch>
+            <Patch>upstream.patch</Patch>
        </Patches>
-         <AdditionalFiles>
-            <AdditionalFile target="ndiswrapper-1.59.patch">ndiswrapper-1.59.patch</AdditionalFile>
-        </AdditionalFiles>
    </Source>

    <Package>
        <Name>ndiswrapper</Name>
        <RuntimeDependencies>
-            <Dependency version="4.1.5">kernel</Dependency>
+            <Dependency version="4.9.6">kernel</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="library" permanent="true">/lib/modules</Path>
@@ -44,12 +41,54 @@
    </Package>

    <History>
+        <Update release="7">
+            <Date>2017-02-07</Date>
+            <Version>1.60</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
+        </Update>
+        <Update release="6">
+            <Date>2016-12-10</Date>
+            <Version>1.60</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
+        <Update release="5">
+            <Date>2016-11-02</Date>
+            <Version>1.60</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
+        <Update release="4">
+            <Date>2016-08-24</Date>
+            <Version>1.60</Version>
+            <Comment>Rebuild for new kernel.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
+        <Update release="3">
+            <Date>2016-08-06</Date>
+            <Version>1.60</Version>
+            <Comment>Release Bump, rebuild for new kernel.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
+        <Update release="2">
+            <Date>2016-06-28</Date>
+            <Version>1.59</Version>
+            <Comment>Release Bump, rebuild for new kernel.</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
        <Update release="1">
-            <Date>2014-08-13</Date>
+            <Date>2016-03-07</Date>
            <Version>1.59</Version>
            <Comment>First release</Comment>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
        </Update>
    </History>
 </PISI>
@@ -34,3 +34,27 @@ def install():

    # Generate some module lists to use within mkinitramfs
    shelltools.system("./generate-module-list %s/lib/modules/%s" % (get.installDIR(), kerneltools.__getSuffix()))
+    
+    
+    
+    #mkinitcpio default config
+    pisitools.dodir("/etc/mkinitcpio.d")
+    shelltools.touch("linux.preset")
+    
+
+    shelltools.echo("linux.preset", "# mkinitcpio preset file for the 'linux' package\n" +
+                    
+                    'ALL_config="/etc/mkinitcpio.conf"\n'+
+                    
+                    'ALL_kver="/boot/kernel-%s"\n\n'% get.srcVERSION() +
+                    "PRESETS=('default' 'fallback') \n\n" +
+                    '#default_config="/etc/mkinitcpio.conf"\n' +
+
+                    'default_image="/boot/initramfs-%s.img"\n'% get.srcVERSION() +
+                    
+                    '#default_options=""\n\n' +
+                    '#fallback_config="/etc/mkinitcpio.conf"\n'+
+                    'fallback_image="/boot/initramfs-%s-fallback.img"\n'% get.srcVERSION() +
+                    'fallback_options="-S autodetect"\n')
+    
+    pisitools.insinto("/etc/mkinitcpio.d", "linux.preset")
@@ -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
- 	bool
- 
+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
+@@ -1112,3 +1112,5 @@ config PPC_LIB_RHEAP
 source "arch/powerpc/kvm/Kconfig"
+ 
+ source "kernel/livepatch/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,10 +83,10 @@ 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
-@@ -18,26 +18,26 @@ endif
+diff -Nurp linux-4.9/scripts/kconfig/Makefile linux-4.9-3rd/scripts/kconfig/Makefile
+--- linux-4.9/scripts/kconfig/Makefile
+++ linux-4.9-3rd/scripts/kconfig/Makefile
+@@ -18,28 +18,28 @@ endif
 # We need this, in case the user has it in its environment
 unexport CONFIG_
 
@@ -113,6 +113,8 @@ diff -Nurp linux-4.1/scripts/kconfig/Makefile linux-4.1-3rd/scripts/kconfig/Make
 -silentoldconfig: $(obj)/conf
 +silentoldconfig: $(obj)/conf 3rdparty/Makefile
 	$(Q)mkdir -p include/config include/generated
+ 	$(Q)test -e include/generated/autoksyms.h || \
+ 	    touch   include/generated/autoksyms.h
 	$< $(silent) --$@ $(Kconfig)
 
 -localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
@@ -120,7 +122,7 @@ diff -Nurp linux-4.1/scripts/kconfig/Makefile linux-4.1-3rd/scripts/kconfig/Make
 	$(Q)mkdir -p include/config include/generated
 	$(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config
 	$(Q)if [ -f .config ]; then 					\
-@@ -80,7 +80,7 @@ simple-targets := oldconfig allnoconfig
+@@ -82,7 +82,7 @@ simple-targets := oldconfig allnoconfig
 	alldefconfig randconfig listnewconfig olddefconfig
 PHONY += $(simple-targets)
 
@@ -129,9 +131,9 @@ diff -Nurp linux-4.1/scripts/kconfig/Makefile linux-4.1-3rd/scripts/kconfig/Make
 	$< $(silent) --$@ $(Kconfig)
 
 PHONY += oldnoconfig savedefconfig defconfig
-@@ -88,12 +88,12 @@ PHONY += oldnoconfig savedefconfig defco
+@@ -90,12 +90,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
@@ -145,8 +147,8 @@ diff -Nurp linux-4.1/scripts/kconfig/Makefile linux-4.1-3rd/scripts/kconfig/Make
 ifeq ($(KBUILD_DEFCONFIG),)
 	$< $(silent) --defconfig $(Kconfig)
 else
-@@ -101,7 +101,7 @@ else
- 	$(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
+@@ -108,26 +108,26 @@ else
+ endif
 endif
 
 -%_defconfig: $(obj)/conf
@@ -154,7 +156,11 @@ 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
+ 
+-%.config: $(obj)/conf
+%.config: $(obj)/conf 3rdparty/Makefile
+ 	$(if $(call configfiles),, $(error No configuration exists for this target on this architecture))
+ 	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(configfiles)
 	+$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig
 
 PHONY += kvmconfig
@@ -162,14 +168,18 @@ diff -Nurp linux-4.1/scripts/kconfig/Makefile linux-4.1-3rd/scripts/kconfig/Make
 +kvmconfig: kvm_guest.config 3rdparty/Makefile
 	@:
 
+ PHONY += xenconfig
+-xenconfig: xen.config
+xenconfig: xen.config 3rdparty/Makefile
+ 	@:
+ 
 PHONY += tinyconfig
- tinyconfig:
-	$(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config
-+	$(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config 3rdparty/Makefile
+-tinyconfig:
+tinyconfig: 
+ 	$(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config
 
 # Help text used by make help
- help:
-@@ -176,6 +176,9 @@ gconf-objs	:= gconf.o zconf.tab.o
+@@ -190,6 +190,9 @@ gconf-objs	:= gconf.o zconf.tab.o
 
 hostprogs-y := conf nconf mconf kxgettext qconf gconf
 
@@ -1,6 +1,6 @@
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/crt.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/crt.c
--- linux-3.12.2/3rdparty/ndiswrapper/crt.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/crt.c	2013-11-28 21:42:10.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/crt.c linux-4.6-rc6-ndis/3rdparty/ndiswrapper/crt.c
+--- linux-4.6-rc6/3rdparty/ndiswrapper/crt.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/crt.c	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,589 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -471,7 +471,7 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/crt.c linux-3.12.2-ndiswrapper-1.59
 +noregparm void WIN_FUNC(_win_srand,1)
 +	(UINT seed)
 +{
-+	net_srandom(seed);
+	prandom_seed(seed);
 +}
 +
 +noregparm int WIN_FUNC(rand,0)
@@ -591,9 +591,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/crt.c linux-3.12.2-ndiswrapper-1.59
 +	printk(KERN_DEBUG "%s: %p: %s\n", ctx, from, buf);
 +	kfree(buf);
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/divdi3.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/divdi3.c
--- linux-3.12.2/3rdparty/ndiswrapper/divdi3.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/divdi3.c	2013-11-28 21:42:10.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/divdi3.c linux-4.6-rc6-ndis/3rdparty/ndiswrapper/divdi3.c
+--- linux-4.6-rc6/3rdparty/ndiswrapper/divdi3.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/divdi3.c	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,329 @@
 +/* 64-bit multiplication and division
 +   Copyright (C) 1989, 1992-1999, 2000, 2001, 2002, 2003
@@ -924,9 +924,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/divdi3.c linux-3.12.2-ndiswrapper-1
 +  __udivmoddi4 (u, v, &w);
 +  return w;
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/hal.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/hal.c
--- linux-3.12.2/3rdparty/ndiswrapper/hal.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/hal.c	2013-11-28 21:42:10.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/hal.c linux-4.6-rc6-ndis/3rdparty/ndiswrapper/hal.c
+--- linux-4.6-rc6/3rdparty/ndiswrapper/hal.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/hal.c	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,157 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -1085,9 +1085,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/hal.c linux-3.12.2-ndiswrapper-1.59
 +#endif
 +	nt_spin_unlock(lock);
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/iw_ndis.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/iw_ndis.c
--- linux-3.12.2/3rdparty/ndiswrapper/iw_ndis.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/iw_ndis.c	2013-11-28 21:42:10.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/iw_ndis.c linux-4.6-rc6-ndis/3rdparty/ndiswrapper/iw_ndis.c
+--- linux-4.6-rc6/3rdparty/ndiswrapper/iw_ndis.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/iw_ndis.c	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,2001 @@
 + /*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -3090,9 +3090,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/iw_ndis.c linux-3.12.2-ndiswrapper-
 +};
 +
 +#endif
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/iw_ndis.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/iw_ndis.h
--- linux-3.12.2/3rdparty/ndiswrapper/iw_ndis.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/iw_ndis.h	2013-11-28 21:42:10.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/iw_ndis.h linux-4.6-rc6-ndis/3rdparty/ndiswrapper/iw_ndis.h
+--- linux-4.6-rc6/3rdparty/ndiswrapper/iw_ndis.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/iw_ndis.h	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,194 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -3288,9 +3288,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/iw_ndis.h linux-3.12.2-ndiswrapper-
 +		    KEY_MGMT_802_1X_NO_WPA, KEY_MGMT_WPA_NONE };
 +
 +#endif // IW_NDIS_H
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/lin2win.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/lin2win.h
--- linux-3.12.2/3rdparty/ndiswrapper/lin2win.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/lin2win.h	2013-11-28 21:42:10.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/lin2win.h linux-4.6-rc6-ndis/3rdparty/ndiswrapper/lin2win.h
+--- linux-4.6-rc6/3rdparty/ndiswrapper/lin2win.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/lin2win.h	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,111 @@
 +/*
 + *  Copyright (C) 2006 Giridhar Pemmasani
@@ -3403,9 +3403,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/lin2win.h linux-3.12.2-ndiswrapper-
 +})
 +
 +#endif // CONFIG_X86_64
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/lin2win.S linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/lin2win.S
--- linux-3.12.2/3rdparty/ndiswrapper/lin2win.S	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/lin2win.S	2013-11-28 21:42:10.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/lin2win.S linux-4.6-rc6-ndis/3rdparty/ndiswrapper/lin2win.S
+--- linux-4.6-rc6/3rdparty/ndiswrapper/lin2win.S	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/lin2win.S	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,138 @@
 +/*
 + *  Copyright (C) 2011 Pavel Roskin
@@ -3545,9 +3545,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/lin2win.S linux-3.12.2-ndiswrapper-
 +lin2win lin2win4, 4
 +lin2win lin2win5, 5
 +lin2win lin2win6, 6
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/loader.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/loader.c
--- linux-3.12.2/3rdparty/ndiswrapper/loader.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/loader.c	2013-11-28 21:42:10.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/loader.c linux-4.6-rc6-ndis/3rdparty/ndiswrapper/loader.c
+--- linux-4.6-rc6/3rdparty/ndiswrapper/loader.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/loader.c	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,967 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -4516,10 +4516,10 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/loader.c linux-3.12.2-ndiswrapper-1
 +	mutex_unlock(&loader_mutex);
 +	EXIT1(return);
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/loader.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/loader.h
--- linux-3.12.2/3rdparty/ndiswrapper/loader.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/loader.h	2013-11-28 21:42:10.000000000 +0200
-@@ -0,0 +1,108 @@
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/loader.h linux-4.6-rc6-ndis/3rdparty/ndiswrapper/loader.h
+--- linux-4.6-rc6/3rdparty/ndiswrapper/loader.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/loader.h	2016-05-01 18:25:43.000000000 +0300
+@@ -0,0 +1,112 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
 + *
@@ -4538,6 +4538,10 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/loader.h linux-3.12.2-ndiswrapper-1
 +#ifndef _LOADER_H_
 +#define _LOADER_H_
 +
+#if LINUX_VERSION_CODE > KERNEL_VERSION(4,0,0)
+#include <linux/vmalloc.h>
+#endif
+
 +#include "ndiswrapper.h"
 +
 +#ifndef __KERNEL__
@@ -4628,9 +4632,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/loader.h linux-3.12.2-ndiswrapper-1
 +#endif
 +
 +#endif /* LOADER_H */
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/longlong.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/longlong.h
--- linux-3.12.2/3rdparty/ndiswrapper/longlong.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/longlong.h	2013-11-28 21:42:10.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/longlong.h linux-4.6-rc6-ndis/3rdparty/ndiswrapper/longlong.h
+--- linux-4.6-rc6/3rdparty/ndiswrapper/longlong.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/longlong.h	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,1333 @@
 +/* longlong.h -- definitions for mixed size 32/64 bit arithmetic.
 +   Copyright (C) 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000
@@ -5965,9 +5969,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/longlong.h linux-3.12.2-ndiswrapper
 +#ifndef UDIV_NEEDS_NORMALIZATION
 +#define UDIV_NEEDS_NORMALIZATION 0
 +#endif
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/Makefile linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/Makefile
--- linux-3.12.2/3rdparty/ndiswrapper/Makefile	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/Makefile	2013-11-28 21:42:10.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/Makefile linux-4.6-rc6-ndis/3rdparty/ndiswrapper/Makefile
+--- linux-4.6-rc6/3rdparty/ndiswrapper/Makefile	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/Makefile	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,213 @@
 +# Name of the module
 +MODNAME = ndiswrapper
@@ -6182,9 +6186,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/Makefile linux-3.12.2-ndiswrapper-1
 +	done
 +
 +.PHONY: all modules clean install config_check dist
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/mkexport.sh linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/mkexport.sh
--- linux-3.12.2/3rdparty/ndiswrapper/mkexport.sh	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/mkexport.sh	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/mkexport.sh linux-4.6-rc6-ndis/3rdparty/ndiswrapper/mkexport.sh
+--- linux-4.6-rc6/3rdparty/ndiswrapper/mkexport.sh	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/mkexport.sh	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,42 @@
 +#! /bin/sh
 +
@@ -6228,9 +6232,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/mkexport.sh linux-3.12.2-ndiswrappe
 +
 +echo "	{NULL, NULL}"
 +echo "};"
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/mkstubs.sh linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/mkstubs.sh
--- linux-3.12.2/3rdparty/ndiswrapper/mkstubs.sh	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/mkstubs.sh	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/mkstubs.sh linux-4.6-rc6-ndis/3rdparty/ndiswrapper/mkstubs.sh
+--- linux-4.6-rc6/3rdparty/ndiswrapper/mkstubs.sh	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/mkstubs.sh	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,12 @@
 +#! /bin/sh
 +
@@ -6244,9 +6248,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/mkstubs.sh linux-3.12.2-ndiswrapper
 +		   win2lin(\1, \2)/p'   \
 +	   $file | sed -e 's/[ \t	]\+//' | sort -u; \
 +done
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ndis.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ndis.c
--- linux-3.12.2/3rdparty/ndiswrapper/ndis.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ndis.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/ndis.c linux-4.6-rc6-ndis/3rdparty/ndiswrapper/ndis.c
+--- linux-4.6-rc6/3rdparty/ndiswrapper/ndis.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/ndis.c	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,3025 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -6688,7 +6692,7 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ndis.c linux-3.12.2-ndiswrapper-1.5
 +	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);
@@ -6752,7 +6756,7 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ndis.c linux-3.12.2-ndiswrapper-1.5
 +
 +	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;
@@ -9273,9 +9277,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ndis.c linux-3.12.2-ndiswrapper-1.5
 +		destroy_workqueue(ndis_wq);
 +	EXIT1(return);
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ndis.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ndis.h
--- linux-3.12.2/3rdparty/ndiswrapper/ndis.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ndis.h	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/ndis.h linux-4.6-rc6-ndis/3rdparty/ndiswrapper/ndis.h
+--- linux-4.6-rc6/3rdparty/ndiswrapper/ndis.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/ndis.h	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,1309 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -10586,9 +10590,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ndis.h linux-3.12.2-ndiswrapper-1.5
 +}
 +
 +#endif /* NDIS_H */
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ndiswrapper.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ndiswrapper.h
--- linux-3.12.2/3rdparty/ndiswrapper/ndiswrapper.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ndiswrapper.h	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/ndiswrapper.h linux-4.6-rc6-ndis/3rdparty/ndiswrapper/ndiswrapper.h
+--- linux-4.6-rc6/3rdparty/ndiswrapper/ndiswrapper.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/ndiswrapper.h	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,219 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -10608,7 +10612,7 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ndiswrapper.h linux-3.12.2-ndiswrap
 +#ifndef _NDISWRAPPER_H_
 +#define _NDISWRAPPER_H_
 +
-+#define DRIVER_VERSION "1.59"
+#define DRIVER_VERSION "1.60"
 +#define UTILS_VERSION "1.9"
 +
 +#define DRIVER_NAME "ndiswrapper"
@@ -10809,9 +10813,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ndiswrapper.h linux-3.12.2-ndiswrap
 +#endif // __KERNEL__
 +
 +#endif // NDISWRAPPER_H
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ntoskernel.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ntoskernel.c
--- linux-3.12.2/3rdparty/ndiswrapper/ntoskernel.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ntoskernel.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/ntoskernel.c linux-4.6-rc6-ndis/3rdparty/ndiswrapper/ntoskernel.c
+--- linux-4.6-rc6/3rdparty/ndiswrapper/ntoskernel.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/ntoskernel.c	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,2677 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -13490,10 +13494,10 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ntoskernel.c linux-3.12.2-ndiswrapp
 +
 +	EXIT2(return);
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ntoskernel.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ntoskernel.h
--- linux-3.12.2/3rdparty/ndiswrapper/ntoskernel.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ntoskernel.h	2013-11-28 21:42:11.000000000 +0200
-@@ -0,0 +1,1083 @@
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/ntoskernel.h linux-4.6-rc6-ndis/3rdparty/ndiswrapper/ntoskernel.h
+--- linux-4.6-rc6/3rdparty/ndiswrapper/ntoskernel.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/ntoskernel.h	2016-05-01 18:25:43.000000000 +0300
+@@ -0,0 +1,1090 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
 + *
@@ -13843,13 +13847,21 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ntoskernel.h linux-3.12.2-ndiswrapp
 +#define netdev_notifier_info_to_dev(x) ((struct net_device *)(x))
 +#endif
 +
-+#ifdef INIT_COMPLETION
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0)
 +static inline void reinit_completion(struct completion *x)
 +{
 +	INIT_COMPLETION(*x);
 +}
 +#endif
 +
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
+#define prandom_seed(seed) net_srandom(seed)
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
+#define strncasecmp strnicmp
+#endif
+
 +/* TICK is 100ns */
 +#define TICKSPERSEC		10000000
 +#define TICKSPERMSEC		10000
@@ -14293,9 +14305,8 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ntoskernel.h linux-3.12.2-ndiswrapp
 +#define nt_spin_unlock_irqrestore(lock, flags)				\
 +do {									\
 +	nt_spin_unlock(lock);						\
-+	preempt_enable_no_resched();					\
+	preempt_enable();						\
 +	local_irq_restore(flags);					\
-+	preempt_check_resched();					\
 +} while (0)
 +
 +static inline ULONG SPAN_PAGES(void *ptr, SIZE_T length)
@@ -14577,9 +14588,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ntoskernel.h linux-3.12.2-ndiswrapp
 +#endif
 +
 +#endif // _NTOSKERNEL_H_
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ntoskernel_io.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ntoskernel_io.c
--- linux-3.12.2/3rdparty/ndiswrapper/ntoskernel_io.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ntoskernel_io.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/ntoskernel_io.c linux-4.6-rc6-ndis/3rdparty/ndiswrapper/ntoskernel_io.c
+--- linux-4.6-rc6/3rdparty/ndiswrapper/ntoskernel_io.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/ntoskernel_io.c	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,1161 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -15742,9 +15753,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ntoskernel_io.c linux-3.12.2-ndiswr
 +	IOTRACE("LowLimit: 0x%lx, HighLimit: 0x%lx", *LowLimit, *HighLimit);
 +	IOEXIT(return);
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/pe_linker.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pe_linker.c
--- linux-3.12.2/3rdparty/ndiswrapper/pe_linker.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pe_linker.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/pe_linker.c linux-4.6-rc6-ndis/3rdparty/ndiswrapper/pe_linker.c
+--- linux-4.6-rc6/3rdparty/ndiswrapper/pe_linker.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/pe_linker.c	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,600 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -16346,9 +16357,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/pe_linker.c linux-3.12.2-ndiswrappe
 +	}
 +	return 0;
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/pe_linker.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pe_linker.h
--- linux-3.12.2/3rdparty/ndiswrapper/pe_linker.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pe_linker.h	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/pe_linker.h linux-4.6-rc6-ndis/3rdparty/ndiswrapper/pe_linker.h
+--- linux-4.6-rc6/3rdparty/ndiswrapper/pe_linker.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/pe_linker.h	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,992 @@
 +/*
 + * This file is an excerpt of winnt.h from WINE, which bears the
@@ -17342,9 +17353,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/pe_linker.h linux-3.12.2-ndiswrappe
 +	WORD	Length;
 +	CHAR	NameString[ 1 ];
 +} IMAGE_RESOURCE_DIRECTORY_STRING,*PIMAGE_RESOURCE_DIRECTORY_STRING;
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/pnp.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pnp.c
--- linux-3.12.2/3rdparty/ndiswrapper/pnp.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pnp.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/pnp.c linux-4.6-rc6-ndis/3rdparty/ndiswrapper/pnp.c
+--- linux-4.6-rc6/3rdparty/ndiswrapper/pnp.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/pnp.c	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,697 @@
 +/*
 + *  Copyright (C) 2005 Giridhar Pemmasani
@@ -18043,9 +18054,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/pnp.c linux-3.12.2-ndiswrapper-1.59
 +}
 +
 +#endif // USB
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/pnp.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pnp.h
--- linux-3.12.2/3rdparty/ndiswrapper/pnp.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pnp.h	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/pnp.h linux-4.6-rc6-ndis/3rdparty/ndiswrapper/pnp.h
+--- linux-4.6-rc6/3rdparty/ndiswrapper/pnp.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/pnp.h	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,36 @@
 +/*
 + *  Copyright (C) 2005 Giridhar Pemmasani
@@ -18083,9 +18094,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/pnp.h linux-3.12.2-ndiswrapper-1.59
 +int wrap_pnp_resume_usb_device(struct usb_interface *intf);
 +
 +#endif
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/proc.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/proc.c
--- linux-3.12.2/3rdparty/ndiswrapper/proc.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/proc.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/proc.c linux-4.6-rc6-ndis/3rdparty/ndiswrapper/proc.c
+--- linux-4.6-rc6/3rdparty/ndiswrapper/proc.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/proc.c	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,588 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -18675,9 +18686,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/proc.c linux-3.12.2-ndiswrapper-1.5
 +	remove_proc_entry("debug", wrap_procfs_entry);
 +	proc_remove(wrap_procfs_entry);
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/rtl.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/rtl.c
--- linux-3.12.2/3rdparty/ndiswrapper/rtl.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/rtl.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/rtl.c linux-4.6-rc6-ndis/3rdparty/ndiswrapper/rtl.c
+--- linux-4.6-rc6/3rdparty/ndiswrapper/rtl.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/rtl.c	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,715 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -19394,9 +19405,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/rtl.c linux-3.12.2-ndiswrapper-1.59
 +	TRACE1("version: %d", version);
 +	return TRUE;
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/usb.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/usb.c
--- linux-3.12.2/3rdparty/ndiswrapper/usb.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/usb.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/usb.c linux-4.6-rc6-ndis/3rdparty/ndiswrapper/usb.c
+--- linux-4.6-rc6/3rdparty/ndiswrapper/usb.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/usb.c	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,1496 @@
 +/*
 + *  Copyright (C) 2004 Jan Kiszka
@@ -20894,9 +20905,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/usb.c linux-3.12.2-ndiswrapper-1.59
 +	kill_all_urbs(wd, 0);
 +	USBEXIT(return);
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/usb.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/usb.h
--- linux-3.12.2/3rdparty/ndiswrapper/usb.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/usb.h	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/usb.h linux-4.6-rc6-ndis/3rdparty/ndiswrapper/usb.h
+--- linux-4.6-rc6/3rdparty/ndiswrapper/usb.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/usb.h	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,360 @@
 +/*
 + *  Copyright (C) 2004 Jan Kiszka
@@ -21258,9 +21269,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/usb.h linux-3.12.2-ndiswrapper-1.59
 +			     struct io_stack_location *irp_sl);
 +
 +#endif /* USB_H */
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/win2lin_stubs.S linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/win2lin_stubs.S
--- linux-3.12.2/3rdparty/ndiswrapper/win2lin_stubs.S	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/win2lin_stubs.S	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/win2lin_stubs.S linux-4.6-rc6-ndis/3rdparty/ndiswrapper/win2lin_stubs.S
+--- linux-4.6-rc6/3rdparty/ndiswrapper/win2lin_stubs.S	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/win2lin_stubs.S	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,253 @@
 +/*
 + *  Copyright (C) 2005 Karl Vogel, Giridhar Pemmasani
@@ -21515,9 +21526,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/win2lin_stubs.S linux-3.12.2-ndiswr
 +#include "win2lin_stubs.h"
 +
 +#endif	/* CONFIG_X86_64 */
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/winnt_types.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/winnt_types.h
--- linux-3.12.2/3rdparty/ndiswrapper/winnt_types.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/winnt_types.h	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/winnt_types.h linux-4.6-rc6-ndis/3rdparty/ndiswrapper/winnt_types.h
+--- linux-4.6-rc6/3rdparty/ndiswrapper/winnt_types.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/winnt_types.h	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,1701 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -23220,9 +23231,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/winnt_types.h linux-3.12.2-ndiswrap
 +
 +
 +#endif /* WINNT_TYPES_H */
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/workqueue.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/workqueue.c
--- linux-3.12.2/3rdparty/ndiswrapper/workqueue.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/workqueue.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/workqueue.c linux-4.6-rc6-ndis/3rdparty/ndiswrapper/workqueue.c
+--- linux-4.6-rc6/3rdparty/ndiswrapper/workqueue.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/workqueue.c	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,279 @@
 +/*
 + *  Copyright (C) 2006 Giridhar Pemmasani
@@ -23503,9 +23514,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/workqueue.c linux-3.12.2-ndiswrappe
 +		wrap_destroy_wq_on(workq, i);
 +	kfree(workq);
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapmem.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapmem.c
--- linux-3.12.2/3rdparty/ndiswrapper/wrapmem.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapmem.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/wrapmem.c linux-4.6-rc6-ndis/3rdparty/ndiswrapper/wrapmem.c
+--- linux-4.6-rc6/3rdparty/ndiswrapper/wrapmem.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/wrapmem.c	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,366 @@
 +/*
 + *  Copyright (C) 2006 Giridhar Pemmasani
@@ -23873,9 +23884,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapmem.c linux-3.12.2-ndiswrapper-
 +#endif
 +	return;
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapmem.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapmem.h
--- linux-3.12.2/3rdparty/ndiswrapper/wrapmem.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapmem.h	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/wrapmem.h linux-4.6-rc6-ndis/3rdparty/ndiswrapper/wrapmem.h
+--- linux-4.6-rc6/3rdparty/ndiswrapper/wrapmem.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/wrapmem.h	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,97 @@
 +/*
 + *  Copyright (C) 2006 Giridhar Pemmasani
@@ -23974,9 +23985,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapmem.h linux-3.12.2-ndiswrapper-
 +#endif // ALLOC_DEBUG
 +
 +#endif
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapndis.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapndis.c
--- linux-3.12.2/3rdparty/ndiswrapper/wrapndis.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapndis.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/wrapndis.c linux-4.6-rc6-ndis/3rdparty/ndiswrapper/wrapndis.c
+--- linux-4.6-rc6/3rdparty/ndiswrapper/wrapndis.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/wrapndis.c	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,2186 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -26164,9 +26175,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapndis.c linux-3.12.2-ndiswrapper
 +	if (wrapndis_wq)
 +		destroy_workqueue(wrapndis_wq);
 +}
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapndis.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapndis.h
--- linux-3.12.2/3rdparty/ndiswrapper/wrapndis.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapndis.h	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/wrapndis.h linux-4.6-rc6-ndis/3rdparty/ndiswrapper/wrapndis.h
+--- linux-4.6-rc6/3rdparty/ndiswrapper/wrapndis.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/wrapndis.h	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,86 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -26254,9 +26265,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapndis.h linux-3.12.2-ndiswrapper
 +struct iw_statistics *get_iw_stats(struct net_device *dev);
 +
 +#endif
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapper.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapper.c
--- linux-3.12.2/3rdparty/ndiswrapper/wrapper.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapper.c	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/wrapper.c linux-4.6-rc6-ndis/3rdparty/ndiswrapper/wrapper.c
+--- linux-4.6-rc6/3rdparty/ndiswrapper/wrapper.c	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/wrapper.c	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,111 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -26369,9 +26380,9 @@ diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapper.c linux-3.12.2-ndiswrapper-
 +
 +module_init(wrapper_init);
 +module_exit(wrapper_exit);
-diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapper.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapper.h
--- linux-3.12.2/3rdparty/ndiswrapper/wrapper.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapper.h	2013-11-28 21:42:11.000000000 +0200
+diff -Nurp linux-4.6-rc6/3rdparty/ndiswrapper/wrapper.h linux-4.6-rc6-ndis/3rdparty/ndiswrapper/wrapper.h
+--- linux-4.6-rc6/3rdparty/ndiswrapper/wrapper.h	1970-01-01 02:00:00.000000000 +0200
+++ linux-4.6-rc6-ndis/3rdparty/ndiswrapper/wrapper.h	2016-05-01 18:25:43.000000000 +0300
@@ -0,0 +1,24 @@
 +/*
 + *  Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani
@@ -1,32 +0,0 @@
-
-Adapt for strnicmp has been replaced by strncasecmp,
-and removed upstream in v4.0-rc1~98:
-
-From af3cd13501eb04ca61d017ff4406f1cbffafdc04 Mon Sep 17 00:00:00 2001
-From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
-Date: Thu, 12 Feb 2015 15:02:15 -0800
-Subject: lib/string.c: remove strnicmp()
-
-
-Signed-off-by: Thomas Backlund <tmb@mageia.org>
-
--- linux/3rdparty/ndiswrapper/ndis.c.orig
-+++ linux/3rdparty/ndiswrapper/ndis.c
-@@ -438,7 +438,7 @@ static int read_setting(struct nt_list *
- 	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 +502,7 @@ wstdcall void WIN_FUNC(NdisWriteConfigur
- 
- 	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;
@@ -0,0 +1,20 @@
+
+Add supprto for 4.7 series kernels.
+
+Signed-off-by: Thomas Backlund <tmb@mageia.org>
+
+diff -urp linux/3rdparty/ndiswrapper.orig/wrapndis.c linux/3rdparty/ndiswrapper/wrapndis.c
+--- linux/3rdparty/ndiswrapper.orig/wrapndis.c	2016-07-04 20:00:13.000000000 +0300
+++ linux/3rdparty/ndiswrapper/wrapndis.c	2016-07-04 20:23:29.454819702 +0300
+@@ -704,7 +704,11 @@ static void tx_worker(struct work_struct
+ 			n = wnd->max_tx_packets;
+ 		n = mp_tx_packets(wnd, wnd->tx_ring_start, n);
+ 		if (n) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
+ 			wnd->net_dev->trans_start = jiffies;
+#else
+			netif_trans_update(wnd->net_dev);
+#endif
+ 			wnd->tx_ring_start =
+ 				(wnd->tx_ring_start + n) % TX_RING_SIZE;
+ 			wnd->is_tx_ring_full = 0;
@@ -1,33 +0,0 @@
-
-Fix build with kernel-3.14
-
-Signed-off-by: Thomas Backlund <tmb@mageia.org>
-
- 3rdparty/ndiswrapper/crt.c        |    2 +-
- 3rdparty/ndiswrapper/ntoskernel.h |    3 +--
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
--- linux/3rdparty/ndiswrapper/crt.c.orig	2014-04-26 19:10:55.000000000 +0300
-+++ linux/3rdparty/ndiswrapper/crt.c	2014-04-26 19:25:27.766116082 +0300
-@@ -467,7 +467,7 @@ noregparm int WIN_FUNC(_win_memcmp,3)
- noregparm void WIN_FUNC(_win_srand,1)
- 	(UINT seed)
- {
-	net_srandom(seed);
-+	prandom_seed((__force u32) seed);
- }
- 
- noregparm int WIN_FUNC(rand,0)
--- linux/3rdparty/ndiswrapper/ntoskernel.h.orig	2014-04-26 19:42:32.000000000 +0300
-+++ linux/3rdparty/ndiswrapper/ntoskernel.h	2014-04-26 19:59:13.662522942 +0300
-@@ -798,9 +798,8 @@ do {									\
- #define nt_spin_unlock_irqrestore(lock, flags)				\
- do {									\
- 	nt_spin_unlock(lock);						\
-	preempt_enable_no_resched();					\
-+	preempt_enable();						\
- 	local_irq_restore(flags);					\
-	preempt_check_resched();					\
- } while (0)
- 
- static inline ULONG SPAN_PAGES(void *ptr, SIZE_T length)
@@ -1,23 +0,0 @@
-From 842e61cb85813b1ed8a1646cbe6739950c0c9822 Mon Sep 17 00:00:00 2001
-From: Larry Finger <Larry.Finger@lwfinger.net>
-Date: Thu, 7 May 2015 19:08:17 +0000
-Subject: [PATCH] rtl8723bs: Fix Makefile to allow warnings
-
-Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git linux.old/3rdparty/rtl8723bs/Makefile linux/3rdparty/rtl8723bs/Makefile
-index a4d9f45..4da73fa 100644
--- linux.old/3rdparty/rtl8723bs/Makefile
-+++ linux/3rdparty/rtl8723bs/Makefile
-@@ -3,7 +3,7 @@ EXTRA_CFLAGS += -O1
- #EXTRA_CFLAGS += -O3
- #EXTRA_CFLAGS += -Wall
- #EXTRA_CFLAGS += -Wextra
-EXTRA_CFLAGS += -Werror
-+#EXTRA_CFLAGS += -Werror
- #EXTRA_CFLAGS += -pedantic
- #EXTRA_CFLAGS += -Wshadow -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes
- 
@@ -0,0 +1,40 @@
+From 61f9738d65094a6b18d22c7beb6bb8c3dc0606b9 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Mon, 26 Oct 2015 15:20:46 +0100
+Subject: [PATCH] ACPI / video: Add a quirk to force acpi-video backlight on
+ Dell XPS L421X
+
+Just like the Dell XPS 15 (L521X) the Dell XPS 14 (L421X) needs to use
+the acpi-video backlight interface rather then the native one for backlight
+control to work, add a quirk for this.
+
+Link: https://bugzilla.redhat.com/show_bug.cgi?id=1272633
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+---
+ drivers/acpi/video_detect.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
+index 0d3a384..daaf1c4 100644
+--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
+@@ -233,6 +233,15 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
+ 		},
+ 	},
+ 	{
+	 /* https://bugzilla.redhat.com/show_bug.cgi?id=1272633 */
+	 .callback = video_detect_force_video,
+	 .ident = "Dell XPS14 L421X",
+	 .matches = {
+		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+		DMI_MATCH(DMI_PRODUCT_NAME, "XPS L421X"),
+		},
+	},
+	{
+ 	 /* https://bugzilla.redhat.com/show_bug.cgi?id=1163574 */
+ 	 .callback = video_detect_force_video,
+ 	 .ident = "Dell XPS15 L521X",
+-- 
+2.3.10
+
@@ -0,0 +1,197 @@
+From 43034bc4606f1f21186ca6fe27bc0448159d5e00 Mon Sep 17 00:00:00 2001
+From: Thomas Backlund <tmb@mageia.org>
+Date: Thu, 10 Mar 2016 15:44:13 +0200
+Subject: [PATCH] Revert "ipmi: Start the timer and thread on internal msgs"
+
+This reverts commit 0cfec916e86d881e209de4b4ae9959a6271e6660.
+
+It's reported on ipmi list that Dell R720xd servers will always panic
+on dell ipmi services load
+
+Reverting this fixes the issue.
+
+Signed-off-by: Thomas Backlund <tmb@mageia.org>
+
+---
+ drivers/char/ipmi/ipmi_si_intf.c | 73 ++++++++++++++++------------------------
+ 1 file changed, 29 insertions(+), 44 deletions(-)
+
+diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
+index 4cc72fa..f667be8 100644
+--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
+@@ -412,42 +412,18 @@ static enum si_sm_result start_next_msg(struct smi_info *smi_info)
+ 	return rv;
+ }
+ 
+-static void smi_mod_timer(struct smi_info *smi_info, unsigned long new_val)
+-{
+-	smi_info->last_timeout_jiffies = jiffies;
+-	mod_timer(&smi_info->si_timer, new_val);
+-	smi_info->timer_running = true;
+-}
+-
+-/*
+- * Start a new message and (re)start the timer and thread.
+- */
+-static void start_new_msg(struct smi_info *smi_info, unsigned char *msg,
+-			  unsigned int size)
+-{
+-	smi_mod_timer(smi_info, jiffies + SI_TIMEOUT_JIFFIES);
+-
+-	if (smi_info->thread)
+-		wake_up_process(smi_info->thread);
+-
+-	smi_info->handlers->start_transaction(smi_info->si_sm, msg, size);
+-}
+-
+-static void start_check_enables(struct smi_info *smi_info, bool start_timer)
+static void start_check_enables(struct smi_info *smi_info)
+ {
+ 	unsigned char msg[2];
+ 
+ 	msg[0] = (IPMI_NETFN_APP_REQUEST << 2);
+ 	msg[1] = IPMI_GET_BMC_GLOBAL_ENABLES_CMD;
+ 
+-	if (start_timer)
+-		start_new_msg(smi_info, msg, 2);
+-	else
+-		smi_info->handlers->start_transaction(smi_info->si_sm, msg, 2);
+	smi_info->handlers->start_transaction(smi_info->si_sm, msg, 2);
+ 	smi_info->si_state = SI_CHECKING_ENABLES;
+ }
+ 
+-static void start_clear_flags(struct smi_info *smi_info, bool start_timer)
+static void start_clear_flags(struct smi_info *smi_info)
+ {
+ 	unsigned char msg[3];
+ 
+@@ -456,10 +432,7 @@ static void start_clear_flags(struct smi_info *smi_info, bool start_timer)
+ 	msg[1] = IPMI_CLEAR_MSG_FLAGS_CMD;
+ 	msg[2] = WDT_PRE_TIMEOUT_INT;
+ 
+-	if (start_timer)
+-		start_new_msg(smi_info, msg, 3);
+-	else
+-		smi_info->handlers->start_transaction(smi_info->si_sm, msg, 3);
+	smi_info->handlers->start_transaction(smi_info->si_sm, msg, 3);
+ 	smi_info->si_state = SI_CLEARING_FLAGS;
+ }
+ 
+@@ -469,8 +442,10 @@ static void start_getting_msg_queue(struct smi_info *smi_info)
+ 	smi_info->curr_msg->data[1] = IPMI_GET_MSG_CMD;
+ 	smi_info->curr_msg->data_size = 2;
+ 
+-	start_new_msg(smi_info, smi_info->curr_msg->data,
+-		      smi_info->curr_msg->data_size);
+	smi_info->handlers->start_transaction(
+		smi_info->si_sm,
+		smi_info->curr_msg->data,
+		smi_info->curr_msg->data_size);
+ 	smi_info->si_state = SI_GETTING_MESSAGES;
+ }
+ 
+@@ -480,11 +455,20 @@ static void start_getting_events(struct smi_info *smi_info)
+ 	smi_info->curr_msg->data[1] = IPMI_READ_EVENT_MSG_BUFFER_CMD;
+ 	smi_info->curr_msg->data_size = 2;
+ 
+-	start_new_msg(smi_info, smi_info->curr_msg->data,
+-		      smi_info->curr_msg->data_size);
+	smi_info->handlers->start_transaction(
+		smi_info->si_sm,
+		smi_info->curr_msg->data,
+		smi_info->curr_msg->data_size);
+ 	smi_info->si_state = SI_GETTING_EVENTS;
+ }
+ 
+static void smi_mod_timer(struct smi_info *smi_info, unsigned long new_val)
+{
+	smi_info->last_timeout_jiffies = jiffies;
+	mod_timer(&smi_info->si_timer, new_val);
+	smi_info->timer_running = true;
+}
+
+ /*
+  * When we have a situtaion where we run out of memory and cannot
+  * allocate messages, we just leave them in the BMC and run the system
+@@ -494,11 +478,11 @@ static void start_getting_events(struct smi_info *smi_info)
+  * Note that we cannot just use disable_irq(), since the interrupt may
+  * be shared.
+  */
+-static inline bool disable_si_irq(struct smi_info *smi_info, bool start_timer)
+static inline bool disable_si_irq(struct smi_info *smi_info)
+ {
+ 	if ((smi_info->irq) && (!smi_info->interrupt_disabled)) {
+ 		smi_info->interrupt_disabled = true;
+-		start_check_enables(smi_info, start_timer);
+		start_check_enables(smi_info);
+ 		return true;
+ 	}
+ 	return false;
+@@ -508,7 +492,7 @@ static inline bool enable_si_irq(struct smi_info *smi_info)
+ {
+ 	if ((smi_info->irq) && (smi_info->interrupt_disabled)) {
+ 		smi_info->interrupt_disabled = false;
+-		start_check_enables(smi_info, true);
+		start_check_enables(smi_info);
+ 		return true;
+ 	}
+ 	return false;
+@@ -526,7 +510,7 @@ static struct ipmi_smi_msg *alloc_msg_handle_irq(struct smi_info *smi_info)
+ 
+ 	msg = ipmi_alloc_smi_msg();
+ 	if (!msg) {
+-		if (!disable_si_irq(smi_info, true))
+		if (!disable_si_irq(smi_info))
+ 			smi_info->si_state = SI_NORMAL;
+ 	} else if (enable_si_irq(smi_info)) {
+ 		ipmi_free_smi_msg(msg);
+@@ -542,7 +526,7 @@ static void handle_flags(struct smi_info *smi_info)
+ 		/* Watchdog pre-timeout */
+ 		smi_inc_stat(smi_info, watchdog_pretimeouts);
+ 
+-		start_clear_flags(smi_info, true);
+		start_clear_flags(smi_info);
+ 		smi_info->msg_flags &= ~WDT_PRE_TIMEOUT_INT;
+ 		if (smi_info->intf)
+ 			ipmi_smi_watchdog_pretimeout(smi_info->intf);
+@@ -895,7 +879,8 @@ static enum si_sm_result smi_event_handler(struct smi_info *smi_info,
+ 			msg[0] = (IPMI_NETFN_APP_REQUEST << 2);
+ 			msg[1] = IPMI_GET_MSG_FLAGS_CMD;
+ 
+-			start_new_msg(smi_info, msg, 2);
+			smi_info->handlers->start_transaction(
+				smi_info->si_sm, msg, 2);
+ 			smi_info->si_state = SI_GETTING_FLAGS;
+ 			goto restart;
+ 		}
+@@ -925,7 +910,7 @@ static enum si_sm_result smi_event_handler(struct smi_info *smi_info,
+ 		 * disable and messages disabled.
+ 		 */
+ 		if (smi_info->supports_event_msg_buff || smi_info->irq) {
+-			start_check_enables(smi_info, true);
+			start_check_enables(smi_info);
+ 		} else {
+ 			smi_info->curr_msg = alloc_msg_handle_irq(smi_info);
+ 			if (!smi_info->curr_msg)
+@@ -3635,7 +3620,7 @@ static int try_smi_init(struct smi_info *new_smi)
+ 	 * Start clearing the flags before we enable interrupts or the
+ 	 * timer to avoid racing with the timer.
+ 	 */
+-	start_clear_flags(new_smi, false);
+	start_clear_flags(new_smi);
+ 
+ 	/*
+ 	 * IRQ is defined to be set when non-zero.  req_events will
+@@ -3930,7 +3915,7 @@ static void cleanup_one_si(struct smi_info *to_clean)
+ 		poll(to_clean);
+ 		schedule_timeout_uninterruptible(1);
+ 	}
+-	disable_si_irq(to_clean, false);
+	disable_si_irq(to_clean);
+ 	while (to_clean->curr_msg || (to_clean->si_state != SI_NORMAL)) {
+ 		poll(to_clean);
+ 		schedule_timeout_uninterruptible(1);
+-- 
+2.7.2
+
@@ -0,0 +1,70 @@
+From ca45663819accf038291dbe2d67ed66dc48d714c Mon Sep 17 00:00:00 2001
+From: Thomas Backlund <tmb@mageia.org>
+Date: Sun, 29 Nov 2015 14:44:22 +0200
+Subject: [PATCH] Revert "x86/mm/mtrr: Remove kernel internal MTRR interfaces:
+ unexport mtrr_add() and mtrr_del()"
+
+This reverts commit 2baa891e42d84159b693eadd44f6fe1486285bdc.
+
+It currently breaks nvidia304 driver.
+
+Signed-of-by: Thomas Backlund <tmb@mageia.org>
+---
+ Documentation/x86/mtrr.txt      | 20 ++++----------------
+ arch/x86/kernel/cpu/mtrr/main.c |  2 ++
+ 2 files changed, 6 insertions(+), 16 deletions(-)
+
+diff --git a/Documentation/x86/mtrr.txt b/Documentation/x86/mtrr.txt
+index dc3e703..860bc3a 100644
+--- a/Documentation/x86/mtrr.txt
+++ b/Documentation/x86/mtrr.txt
+@@ -6,22 +6,10 @@ Luis R. Rodriguez <mcgrof@do-not-panic.com> - April 9, 2015
+ ===============================================================================
+ Phasing out MTRR use
+ 
+-MTRR use is replaced on modern x86 hardware with PAT. Direct MTRR use by
+-drivers on Linux is now completely phased out, device drivers should use
+-arch_phys_wc_add() in combination with ioremap_wc() to make MTRR effective on
+-non-PAT systems while a no-op but equally effective on PAT enabled systems.
+-
+-Even if Linux does not use MTRRs directly, some x86 platform firmware may still
+-set up MTRRs early before booting the OS. They do this as some platform
+-firmware may still have implemented access to MTRRs which would be controlled
+-and handled by the platform firmware directly. An example of platform use of
+-MTRRs is through the use of SMI handlers, one case could be for fan control,
+-the platform code would need uncachable access to some of its fan control
+-registers. Such platform access does not need any Operating System MTRR code in
+-place other than mtrr_type_lookup() to ensure any OS specific mapping requests
+-are aligned with platform MTRR setup. If MTRRs are only set up by the platform
+-firmware code though and the OS does not make any specific MTRR mapping
+-requests mtrr_type_lookup() should always return MTRR_TYPE_INVALID.
+MTRR use is replaced on modern x86 hardware with PAT. Over time the only type
+of effective MTRR that is expected to be supported will be for write-combining.
+As MTRR use is phased out device drivers should use arch_phys_wc_add() to make
+MTRR effective on non-PAT systems while a no-op on PAT enabled systems.
+ 
+ For details refer to Documentation/x86/pat.txt.
+ 
+diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
+index f891b47..e7ed0d8 100644
+--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
+@@ -448,6 +448,7 @@ int mtrr_add(unsigned long base, unsigned long size, unsigned int type,
+ 	return mtrr_add_page(base >> PAGE_SHIFT, size >> PAGE_SHIFT, type,
+ 			     increment);
+ }
+EXPORT_SYMBOL(mtrr_add);
+ 
+ /**
+  * mtrr_del_page - delete a memory type region
+@@ -536,6 +537,7 @@ int mtrr_del(int reg, unsigned long base, unsigned long size)
+ 		return -EINVAL;
+ 	return mtrr_del_page(reg, base >> PAGE_SHIFT, size >> PAGE_SHIFT);
+ }
+EXPORT_SYMBOL(mtrr_del);
+ 
+ /**
+  * arch_phys_wc_add - add a WC MTRR and handle errors if PAT is unavailable
+-- 
+2.3.10
+
@@ -0,0 +1,39 @@
+From 7020bcb82838006e23d058ff07b063b393ed3f10 Mon Sep 17 00:00:00 2001
+From: Zhang Rui <rui.zhang@intel.com>
+Date: Tue, 29 Nov 2016 23:19:46 +0100
+Subject: [PATCH] ACPI: do not warn if _BQC does not exist
+
+Starting from ACPI spec 3.0, it's only clarified that _BCM control
+method is required if _BCL is implemented. There is no word
+saying _BQC is required.
+
+And in ACPI spec 6.1 B.5.4, for _BQC, it is explicitly stated that
+"This optional method returns the current brightness level of a
+built-in display output device. If present, it must be set by
+the platform for initial brightness."
+
+Thus remove the obsolete warning message.
+
+Signed-off-by: Zhang Rui <rui.zhang@intel.com>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+---
+ drivers/acpi/scan.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
+index 3d1856f..07aa2e6 100644
+--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
+@@ -1119,9 +1119,6 @@ acpi_backlight_cap_match(acpi_handle handle, u32 level, void *context,
+ 		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found generic backlight "
+ 				  "support\n"));
+ 		*cap |= ACPI_VIDEO_BACKLIGHT;
+-		if (!acpi_has_method(handle, "_BQC"))
+-			printk(KERN_WARNING FW_BUG PREFIX "No _BQC method, "
+-				"cannot determine initial brightness\n");
+ 		/* We have backlight support, no need to scan further */
+ 		return AE_CTRL_TERMINATE;
+ 	}
+-- 
+2.10.2
+
@@ -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,
@@ -20,12 +20,13 @@ diff --git a/drivers/Makefile b/drivers/Makefile
 index 932e8bf..e8df3d0 100644
 --- a/drivers/Makefile
 +++ b/drivers/Makefile
-@@ -64,9 +64,9 @@ obj-y				+= base/ block/ misc/ mfd/ nfc/
+@@ -69,10 +69,10 @@ obj-$(CONFIG_LIBNVDIMM)		+= nvdimm/
 obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf/
 obj-$(CONFIG_NUBUS)		+= nubus/
 obj-y				+= macintosh/
 -obj-$(CONFIG_IDE)		+= ide/
 obj-$(CONFIG_SCSI)		+= scsi/
+ obj-y				+= nvme/
 obj-$(CONFIG_ATA)		+= ata/
 +obj-$(CONFIG_IDE)		+= ide/
 obj-$(CONFIG_TARGET_CORE)	+= target/
@@ -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
-
@@ -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;
+ 		}
+ 	}
@@ -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
-
@@ -0,0 +1,103 @@
+From 465ed48c05de63f5bdd34d83915f1b8998a62134 Mon Sep 17 00:00:00 2001
+From: Paolo Valente <paolo.valente@unimore.it>
+Date: Tue, 7 Apr 2015 13:39:12 +0200
+Subject: [PATCH 1/4] block: cgroups, kconfig, build bits for BFQ-v7r11-4.5.0
+
+Update Kconfig.iosched and do the related Makefile changes to include
+kernel configuration options for BFQ. Also increase the number of
+policies supported by the blkio controller so that BFQ can add its
+own.
+
+Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
+Signed-off-by: Arianna Avanzini <avanzini@google.com>
+---
+ block/Kconfig.iosched  | 32 ++++++++++++++++++++++++++++++++
+ block/Makefile         |  1 +
+ include/linux/blkdev.h |  2 +-
+ 3 files changed, 34 insertions(+), 1 deletion(-)
+
+diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
+index 421bef9..0ee5f0f 100644
+--- a/block/Kconfig.iosched
+++ b/block/Kconfig.iosched
+@@ -39,6 +39,27 @@ config CFQ_GROUP_IOSCHED
+ 	---help---
+ 	  Enable group IO scheduling in CFQ.
+ 
+config IOSCHED_BFQ
+	tristate "BFQ I/O scheduler"
+	default n
+	---help---
+	  The BFQ I/O scheduler tries to distribute bandwidth among
+	  all processes according to their weights.
+	  It aims at distributing the bandwidth as desired, independently of
+	  the disk parameters and with any workload. It also tries to
+	  guarantee low latency to interactive and soft real-time
+	  applications. If compiled built-in (saying Y here), BFQ can
+	  be configured to support hierarchical scheduling.
+
+config CGROUP_BFQIO
+	bool "BFQ hierarchical scheduling support"
+	depends on CGROUPS && IOSCHED_BFQ=y
+	default n
+	---help---
+	  Enable hierarchical scheduling in BFQ, using the cgroups
+	  filesystem interface.  The name of the subsystem will be
+	  bfqio.
+
+ choice
+ 	prompt "Default I/O scheduler"
+ 	default DEFAULT_CFQ
+@@ -52,6 +73,16 @@ choice
+ 	config DEFAULT_CFQ
+ 		bool "CFQ" if IOSCHED_CFQ=y
+ 
+	config DEFAULT_BFQ
+		bool "BFQ" if IOSCHED_BFQ=y
+		help
+		  Selects BFQ as the default I/O scheduler which will be
+		  used by default for all block devices.
+		  The BFQ I/O scheduler aims at distributing the bandwidth
+		  as desired, independently of the disk parameters and with
+		  any workload. It also tries to guarantee low latency to
+		  interactive and soft real-time applications.
+
+ 	config DEFAULT_NOOP
+ 		bool "No-op"
+ 
+@@ -61,6 +92,7 @@ config DEFAULT_IOSCHED
+ 	string
+ 	default "deadline" if DEFAULT_DEADLINE
+ 	default "cfq" if DEFAULT_CFQ
+	default "bfq" if DEFAULT_BFQ
+ 	default "noop" if DEFAULT_NOOP
+ 
+ endmenu
+diff --git a/block/Makefile b/block/Makefile
+index 36acdd7..736e91a 100644
+--- a/block/Makefile
+++ b/block/Makefile
+@@ -18,6 +18,7 @@ obj-$(CONFIG_BLK_DEV_THROTTLING)	+= blk-throttle.o
+ obj-$(CONFIG_IOSCHED_NOOP)	+= noop-iosched.o
+ obj-$(CONFIG_IOSCHED_DEADLINE)	+= deadline-iosched.o
+ obj-$(CONFIG_IOSCHED_CFQ)	+= cfq-iosched.o
+obj-$(CONFIG_IOSCHED_BFQ)	+= bfq-iosched.o
+ 
+ obj-$(CONFIG_BLOCK_COMPAT)	+= compat_ioctl.o
+ obj-$(CONFIG_BLK_CMDLINE_PARSER)	+= cmdline-parser.o
+diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
+index c47c358..1047d99 100644
+--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
+@@ -45,7 +45,7 @@ struct pr_ops;
+  * Maximum number of blkcg policies allowed to be registered concurrently.
+  * Defined here to simplify include dependency.
+  */
+-#define BLKCG_MAX_POLS		2
+#define BLKCG_MAX_POLS		3
+ 
+ typedef void (rq_end_io_fn)(struct request *, int);
+ 
+-- 
+2.10.0
+
@@ -0,0 +1,115 @@
+From bc33c5df710c0aae6db396146194108634ef6f60 Mon Sep 17 00:00:00 2001
+From: "Winkler, Tomas" <tomas.winkler@intel.com>
+Date: Mon, 12 Sep 2016 16:04:19 +0300
+Subject: [PATCH] tmp/tpm_crb: fix Intel PTT hw bug during idle state
+
+There is a HW bug in Skylake, and Broxton PCH Intel PTT device, where
+most of the registers in the control area except START, REQUEST, CANCEL,
+and LOC_CTRL lost retention when the device is in the idle state. Hence
+we need to bring the device to ready state before accessing the other
+registers. The fix brings device to ready state before trying to read
+command and response buffer addresses in order to remap the for access.
+
+Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
+Tested-by: Jarkko Sakkinen <jarkko.sakkinn@linux.intel.com>
+Reviewed-by: Jarkko Sakkinen <jarkko.sakkinn@linux.intel.com>
+Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
+---
+ drivers/char/tpm/tpm_crb.c | 47 ++++++++++++++++++++++++++++++++++++++--------
+ 1 file changed, 39 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
+index 8dd0f20..ff0d505 100644
+--- a/drivers/char/tpm/tpm_crb.c
+++ b/drivers/char/tpm/tpm_crb.c
+@@ -315,6 +315,7 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv,
+ 	struct list_head resources;
+ 	struct resource io_res;
+ 	struct device *dev = &device->dev;
+	u32 pa_high, pa_low;
+ 	u64 cmd_pa;
+ 	u32 cmd_size;
+ 	u64 rsp_pa;
+@@ -342,12 +343,27 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv,
+ 	if (IS_ERR(priv->cca))
+ 		return PTR_ERR(priv->cca);
+ 
+-	cmd_pa = ((u64) ioread32(&priv->cca->cmd_pa_high) << 32) |
+-		  (u64) ioread32(&priv->cca->cmd_pa_low);
+	/*
+	 * PTT HW bug w/a: wake up the device to access
+	 * possibly not retained registers.
+	 */
+	ret = crb_cmd_ready(dev, priv);
+	if (ret)
+		return ret;
+
+	pa_high = ioread32(&priv->cca->cmd_pa_high);
+	pa_low  = ioread32(&priv->cca->cmd_pa_low);
+	cmd_pa = ((u64)pa_high << 32) | pa_low;
+ 	cmd_size = ioread32(&priv->cca->cmd_size);
+
+	dev_dbg(dev, "cmd_hi = %X cmd_low = %X cmd_size %X\n",
+		pa_high, pa_low, cmd_size);
+
+ 	priv->cmd = crb_map_res(dev, priv, &io_res, cmd_pa, cmd_size);
+-	if (IS_ERR(priv->cmd))
+-		return PTR_ERR(priv->cmd);
+	if (IS_ERR(priv->cmd)) {
+		ret = PTR_ERR(priv->cmd);
+		goto out;
+	}
+ 
+ 	memcpy_fromio(&rsp_pa, &priv->cca->rsp_pa, 8);
+ 	rsp_pa = le64_to_cpu(rsp_pa);
+@@ -355,7 +371,8 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv,
+ 
+ 	if (cmd_pa != rsp_pa) {
+ 		priv->rsp = crb_map_res(dev, priv, &io_res, rsp_pa, rsp_size);
+-		return PTR_ERR_OR_ZERO(priv->rsp);
+		ret = PTR_ERR_OR_ZERO(priv->rsp);
+		goto out;
+ 	}
+ 
+ 	/* According to the PTP specification, overlapping command and response
+@@ -363,12 +380,18 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv,
+ 	 */
+ 	if (cmd_size != rsp_size) {
+ 		dev_err(dev, FW_BUG "overlapping command and response buffer sizes are not identical");
+-		return -EINVAL;
+		ret = -EINVAL;
+		goto out;
+ 	}
+
+ 	priv->cmd_size = cmd_size;
+ 
+ 	priv->rsp = priv->cmd;
+-	return 0;
+
+out:
+	crb_go_idle(dev, priv);
+
+	return ret;
+ }
+ 
+ static int crb_acpi_add(struct acpi_device *device)
+@@ -412,7 +435,15 @@ static int crb_acpi_add(struct acpi_device *device)
+ 	if (rc)
+ 		return rc;
+ 
+-	return crb_init(device, priv);
+	rc  = crb_cmd_ready(dev, priv);
+	if (rc)
+		return rc;
+
+	rc = crb_init(device, priv);
+	if (rc)
+		crb_go_idle(dev, priv);
+
+	return rc;
+ }
+ 
+ static int crb_acpi_remove(struct acpi_device *device)
+-- 
+2.10.2
+
@@ -0,0 +1,134 @@
+From e74f2f76c13770bb8e004475a933923e9c92723d Mon Sep 17 00:00:00 2001
+From: "Winkler, Tomas" <tomas.winkler@intel.com>
+Date: Sat, 8 Oct 2016 14:59:39 +0300
+Subject: [PATCH] tmp/tpm_crb: implement runtime pm for tpm_crb
+
+Utilize runtime_pm for driving tpm crb idle states.
+The framework calls cmd_ready from the pm_runtime_resume handler
+and go idle from the pm_runtime_suspend handler.
+The TPM framework should wake the device before transmit and receive.
+In case the runtime_pm framework is not compiled in or enabled, the device
+will be in the permanent ready state.
+
+Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
+Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
+Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
+Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
+---
+ drivers/char/tpm/tpm-interface.c |  5 +++++
+ drivers/char/tpm/tpm_crb.c       | 42 ++++++++++++++++++++++++++++++++++++----
+ 2 files changed, 43 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
+index 3a9149c..cb0e57e 100644
+--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
+@@ -29,6 +29,7 @@
+ #include <linux/mutex.h>
+ #include <linux/spinlock.h>
+ #include <linux/freezer.h>
+#include <linux/pm_runtime.h>
+ 
+ #include "tpm.h"
+ #include "tpm_eventlog.h"
+@@ -356,6 +357,8 @@ ssize_t tpm_transmit(struct tpm_chip *chip, const u8 *buf, size_t bufsiz,
+ 	if (!(flags & TPM_TRANSMIT_UNLOCKED))
+ 		mutex_lock(&chip->tpm_mutex);
+ 
+	pm_runtime_get_sync(chip->dev.parent);
+
+ 	rc = chip->ops->send(chip, (u8 *) buf, count);
+ 	if (rc < 0) {
+ 		dev_err(&chip->dev,
+@@ -397,6 +400,8 @@ ssize_t tpm_transmit(struct tpm_chip *chip, const u8 *buf, size_t bufsiz,
+ 		dev_err(&chip->dev,
+ 			"tpm_transmit: tpm_recv: error %zd\n", rc);
+ out:
+	pm_runtime_put_sync(chip->dev.parent);
+
+ 	if (!(flags & TPM_TRANSMIT_UNLOCKED))
+ 		mutex_unlock(&chip->tpm_mutex);
+ 	return rc;
+diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
+index f579f1a..717b6b4 100644
+--- a/drivers/char/tpm/tpm_crb.c
+++ b/drivers/char/tpm/tpm_crb.c
+@@ -19,6 +19,7 @@
+ #include <linux/highmem.h>
+ #include <linux/rculist.h>
+ #include <linux/module.h>
+#include <linux/pm_runtime.h>
+ #include "tpm.h"
+ 
+ #define ACPI_SIG_TPM2 "TPM2"
+@@ -149,8 +150,6 @@ static int __maybe_unused crb_cmd_ready(struct device *dev,
+ 	return 0;
+ }
+ 
+-static SIMPLE_DEV_PM_OPS(crb_pm, tpm_pm_suspend, tpm_pm_resume);
+-
+ static u8 crb_status(struct tpm_chip *chip)
+ {
+ 	struct crb_priv *priv = dev_get_drvdata(&chip->dev);
+@@ -433,11 +432,21 @@ static int crb_acpi_add(struct acpi_device *device)
+ 	if (rc)
+ 		return rc;
+ 
+	pm_runtime_get_noresume(dev);
+	pm_runtime_set_active(dev);
+	pm_runtime_enable(dev);
+
+ 	rc = tpm_chip_register(chip);
+-	if (rc)
+	if (rc) {
+ 		crb_go_idle(dev, priv);
+		pm_runtime_put_noidle(dev);
+		pm_runtime_disable(dev);
+		return rc;
+	}
+ 
+-	return rc;
+	pm_runtime_put(dev);
+
+	return 0;
+ }
+ 
+ static int crb_acpi_remove(struct acpi_device *device)
+@@ -447,9 +456,34 @@ static int crb_acpi_remove(struct acpi_device *device)
+ 
+ 	tpm_chip_unregister(chip);
+ 
+	pm_runtime_disable(dev);
+
+ 	return 0;
+ }
+ 
+#ifdef CONFIG_PM
+static int crb_pm_runtime_suspend(struct device *dev)
+{
+	struct tpm_chip *chip = dev_get_drvdata(dev);
+	struct crb_priv *priv = dev_get_drvdata(&chip->dev);
+
+	return crb_go_idle(dev, priv);
+}
+
+static int crb_pm_runtime_resume(struct device *dev)
+{
+	struct tpm_chip *chip = dev_get_drvdata(dev);
+	struct crb_priv *priv = dev_get_drvdata(&chip->dev);
+
+	return crb_cmd_ready(dev, priv);
+}
+#endif /* CONFIG_PM */
+
+static const struct dev_pm_ops crb_pm = {
+	SET_SYSTEM_SLEEP_PM_OPS(tpm_pm_suspend, tpm_pm_resume)
+	SET_RUNTIME_PM_OPS(crb_pm_runtime_suspend, crb_pm_runtime_resume, NULL)
+};
+
+ static struct acpi_device_id crb_device_ids[] = {
+ 	{"MSFT0101", 0},
+ 	{"", 0},
+-- 
+2.10.2
+
@@ -0,0 +1,111 @@
+From ba5287b6ef6a2ee91dc6cc0829649cecf7b70253 Mon Sep 17 00:00:00 2001
+From: "Winkler, Tomas" <tomas.winkler@intel.com>
+Date: Thu, 15 Sep 2016 10:27:38 +0300
+Subject: [PATCH] tpm/tpm_crb: implement tpm crb idle state
+
+The register TPM_CRB_CTRL_REQ_x contains bits goIdle and cmdReady for
+SW to indicate that the device can enter or should exit the idle state.
+
+The legacy ACPI-start (SMI + DMA) based devices do not support these
+bits and the idle state management is not exposed to the host SW.
+Thus, this functionality only is enabled only for a CRB start (MMIO)
+based devices.
+
+Based on Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
+original patch:
+'tpm_crb: implement power tpm crb power management'
+
+To keep the implementation local to the hw we don't use wait_for_tpm_stat
+for polling the TPM_CRB_CTRL_REQ.
+
+[jarkko.sakkinen@linux.intel.com: removed cmdReady debug trace on a
+ success case due the heavy amount of log traffic it causes.]
+
+Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
+Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
+Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
+Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
+---
+ drivers/char/tpm/tpm_crb.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 66 insertions(+)
+
+diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
+index a7c870a..8dd0f20 100644
+--- a/drivers/char/tpm/tpm_crb.c
+++ b/drivers/char/tpm/tpm_crb.c
+@@ -83,6 +83,72 @@ struct crb_priv {
+ 	u32 cmd_size;
+ };
+ 
+/**
+ * crb_go_idle - request tpm crb device to go the idle state
+ *
+ * @dev:  crb device
+ * @priv: crb private data
+ *
+ * Write CRB_CTRL_REQ_GO_IDLE to TPM_CRB_CTRL_REQ
+ * The device should respond within TIMEOUT_C by clearing the bit.
+ * Anyhow, we do not wait here as a consequent CMD_READY request
+ * will be handled correctly even if idle was not completed.
+ *
+ * The function does nothing for devices with ACPI-start method.
+ *
+ * Return: 0 always
+ */
+static int __maybe_unused crb_go_idle(struct device *dev, struct crb_priv *priv)
+{
+	if (priv->flags & CRB_FL_ACPI_START)
+		return 0;
+
+	iowrite32(CRB_CTRL_REQ_GO_IDLE, &priv->cca->req);
+	/* we don't really care when this settles */
+
+	return 0;
+}
+
+/**
+ * crb_cmd_ready - request tpm crb device to enter ready state
+ *
+ * @dev:  crb device
+ * @priv: crb private data
+ *
+ * Write CRB_CTRL_REQ_CMD_READY to TPM_CRB_CTRL_REQ
+ * and poll till the device acknowledge it by clearing the bit.
+ * The device should respond within TIMEOUT_C.
+ *
+ * The function does nothing for devices with ACPI-start method
+ *
+ * Return: 0 on success -ETIME on timeout;
+ */
+static int __maybe_unused crb_cmd_ready(struct device *dev,
+					struct crb_priv *priv)
+{
+	ktime_t stop, start;
+
+	if (priv->flags & CRB_FL_ACPI_START)
+		return 0;
+
+	iowrite32(CRB_CTRL_REQ_CMD_READY, &priv->cca->req);
+
+	start = ktime_get();
+	stop = ktime_add(start, ms_to_ktime(TPM2_TIMEOUT_C));
+	do {
+		if (!(ioread32(&priv->cca->req) & CRB_CTRL_REQ_CMD_READY))
+			return 0;
+		usleep_range(50, 100);
+	} while (ktime_before(ktime_get(), stop));
+
+	if (ioread32(&priv->cca->req) & CRB_CTRL_REQ_CMD_READY) {
+		dev_warn(dev, "cmdReady timed out\n");
+		return -ETIME;
+	}
+
+	return 0;
+}
+
+ static SIMPLE_DEV_PM_OPS(crb_pm, tpm_pm_suspend, tpm_pm_resume);
+ 
+ static u8 crb_status(struct tpm_chip *chip)
+-- 
+2.10.2
+
@@ -0,0 +1,75 @@
+From c58bd34cec4c05f8e3362a79ae94de9f405c39b5 Mon Sep 17 00:00:00 2001
+From: "Winkler, Tomas" <tomas.winkler@intel.com>
+Date: Mon, 12 Sep 2016 16:04:20 +0300
+Subject: [PATCH] tpm/tpm_crb: open code the crb_init into acpi_add
+
+This is preparation step for implementing tpm crb
+runtime pm. We need to have tpm chip allocated
+and populated before we access the runtime handlers.
+
+Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
+Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
+Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
+Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
+---
+ drivers/char/tpm/tpm_crb.c | 26 ++++++++++----------------
+ 1 file changed, 10 insertions(+), 16 deletions(-)
+
+diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
+index ff0d505..f579f1a 100644
+--- a/drivers/char/tpm/tpm_crb.c
+++ b/drivers/char/tpm/tpm_crb.c
+@@ -262,21 +262,6 @@ static const struct tpm_class_ops tpm_crb = {
+ 	.req_complete_val = CRB_DRV_STS_COMPLETE,
+ };
+ 
+-static int crb_init(struct acpi_device *device, struct crb_priv *priv)
+-{
+-	struct tpm_chip *chip;
+-
+-	chip = tpmm_chip_alloc(&device->dev, &tpm_crb);
+-	if (IS_ERR(chip))
+-		return PTR_ERR(chip);
+-
+-	dev_set_drvdata(&chip->dev, priv);
+-	chip->acpi_dev_handle = device->handle;
+-	chip->flags = TPM_CHIP_FLAG_TPM2;
+-
+-	return tpm_chip_register(chip);
+-}
+-
+ static int crb_check_resource(struct acpi_resource *ares, void *data)
+ {
+ 	struct resource *io_res = data;
+@@ -398,6 +383,7 @@ static int crb_acpi_add(struct acpi_device *device)
+ {
+ 	struct acpi_table_tpm2 *buf;
+ 	struct crb_priv *priv;
+	struct tpm_chip *chip;
+ 	struct device *dev = &device->dev;
+ 	acpi_status status;
+ 	u32 sm;
+@@ -435,11 +421,19 @@ static int crb_acpi_add(struct acpi_device *device)
+ 	if (rc)
+ 		return rc;
+ 
+	chip = tpmm_chip_alloc(dev, &tpm_crb);
+	if (IS_ERR(chip))
+		return PTR_ERR(chip);
+
+	dev_set_drvdata(&chip->dev, priv);
+	chip->acpi_dev_handle = device->handle;
+	chip->flags = TPM_CHIP_FLAG_TPM2;
+
+ 	rc  = crb_cmd_ready(dev, priv);
+ 	if (rc)
+ 		return rc;
+ 
+-	rc = crb_init(device, priv);
+	rc = tpm_chip_register(chip);
+ 	if (rc)
+ 		crb_go_idle(dev, priv);
+ 
+-- 
+2.10.2
+
@@ -8,13 +8,14 @@ Signed-off-by: Thomas Backlund <tmb@mageia.org>
 drivers/md/dm-raid.c |    2 ++
 1 file changed, 2 insertions(+)

--- linux-2.6.38.2-mga2/drivers/md/dm-raid.c.orig	2011-03-15 03:20:32.000000000 +0200
-+++ linux-2.6.38.2-mga2/drivers/md/dm-raid.c	2011-04-02 21:52:21.331302590 +0300
-@@ -693,5 +693,7 @@ MODULE_DESCRIPTION(DM_NAME " raid4/5/6 t
+--- linux/drivers/md/dm-raid.c.orig
+++ linux/drivers/md/dm-raid.c
+@@ -3689,6 +3689,8 @@ MODULE_ALIAS("dm-raid10");
 MODULE_ALIAS("dm-raid4");
 MODULE_ALIAS("dm-raid5");
 MODULE_ALIAS("dm-raid6");
 +MODULE_ALIAS("dm-raid45");
 +MODULE_ALIAS("dm-raid4-5");
 MODULE_AUTHOR("Neil Brown <dm-devel@redhat.com>");
+ MODULE_AUTHOR("Heinz Mauelshagen <dm-devel@redhat.com>");
 MODULE_LICENSE("GPL");
@@ -0,0 +1,402 @@
+
+ fs/aufs/Kconfig          |    2 +-
+ fs/dcache.c              |    2 ++
+ fs/exec.c                |    1 +
+ fs/fcntl.c               |    1 +
+ fs/file_table.c          |    4 ++++
+ fs/inode.c               |    1 +
+ fs/namespace.c           |    2 ++
+ fs/notify/group.c        |    4 ++++
+ fs/notify/mark.c         |    4 ++++
+ fs/open.c                |    2 ++
+ fs/read_write.c          |    2 ++
+ fs/splice.c              |    2 ++
+ fs/xattr.c               |    1 +
+ kernel/task_work.c       |    1 +
+ security/commoncap.c     |    2 ++
+ security/device_cgroup.c |    2 ++
+ security/security.c      |   10 ++++++++++
+ 17 files changed, 42 insertions(+), 1 deletion(-)
+
+diff -Nurp linux-4.9-aufs/fs/aufs/Kconfig linux-4.9-aufs-mod/fs/aufs/Kconfig
+--- linux-4.9-aufs/fs/aufs/Kconfig	2016-12-31 00:31:52.367789380 +0200
+++ linux-4.9-aufs-mod/fs/aufs/Kconfig	2016-12-31 00:32:35.153785422 +0200
+@@ -1,5 +1,5 @@
+ config AUFS_FS
+-	bool "Aufs (Advanced multi layered unification filesystem) support"
+	tristate "Aufs (Advanced multi layered unification filesystem) support"
+ 	help
+ 	Aufs is a stackable unification filesystem such as Unionfs,
+ 	which unifies several directories and provides a merged single
+diff -Nurp linux-4.9-aufs/fs/dcache.c linux-4.9-aufs-mod/fs/dcache.c
+--- linux-4.9-aufs/fs/dcache.c	2016-12-31 00:31:52.379789379 +0200
+++ linux-4.9-aufs-mod/fs/dcache.c	2016-12-31 01:49:12.324360147 +0200
+@@ -1272,6 +1272,7 @@ rename_retry:
+ 	seq = 1;
+ 	goto again;
+ }
+EXPORT_SYMBOL_GPL(d_walk);
+ 
+ /*
+  * Search for at least 1 mount point in the dentry's subdirs.
+@@ -2855,6 +2856,7 @@ void d_exchange(struct dentry *dentry1,
+ 
+ 	write_sequnlock(&rename_lock);
+ }
+EXPORT_SYMBOL_GPL(d_exchange);
+ 
+ /**
+  * d_ancestor - search for an ancestor
+diff -Nurp linux-4.9-aufs/fs/exec.c linux-4.9-aufs-mod/fs/exec.c
+--- linux-4.9-aufs/fs/exec.c	2016-12-11 21:17:54.000000000 +0200
+++ linux-4.9-aufs-mod/fs/exec.c	2016-12-31 00:32:35.153785422 +0200
+@@ -104,6 +104,7 @@ bool path_noexec(const struct path *path
+ 	return (path->mnt->mnt_flags & MNT_NOEXEC) ||
+ 	       (path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
+ }
+EXPORT_SYMBOL_GPL(path_noexec);
+ 
+ #ifdef CONFIG_USELIB
+ /*
+diff -Nurp linux-4.9-aufs/fs/fcntl.c linux-4.9-aufs-mod/fs/fcntl.c
+--- linux-4.9-aufs/fs/fcntl.c	2016-12-31 00:31:52.379789379 +0200
+++ linux-4.9-aufs-mod/fs/fcntl.c	2016-12-31 00:32:35.154785422 +0200
+@@ -82,6 +82,7 @@ int setfl(int fd, struct file * filp, un
+  out:
+ 	return error;
+ }
+EXPORT_SYMBOL_GPL(setfl);
+ 
+ static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
+                      int force)
+diff -Nurp linux-4.9-aufs/fs/file_table.c linux-4.9-aufs-mod/fs/file_table.c
+--- linux-4.9-aufs/fs/file_table.c	2016-12-11 21:17:54.000000000 +0200
+++ linux-4.9-aufs-mod/fs/file_table.c	2016-12-31 00:32:35.154785422 +0200
+@@ -147,6 +147,7 @@ over:
+ 	}
+ 	return ERR_PTR(-ENFILE);
+ }
+EXPORT_SYMBOL_GPL(get_empty_filp);
+ 
+ /**
+  * alloc_file - allocate and initialize a 'struct file'
+@@ -258,6 +259,7 @@ void flush_delayed_fput(void)
+ {
+ 	delayed_fput(NULL);
+ }
+EXPORT_SYMBOL_GPL(flush_delayed_fput);
+ 
+ static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput);
+ 
+@@ -300,6 +302,7 @@ void __fput_sync(struct file *file)
+ }
+ 
+ EXPORT_SYMBOL(fput);
+EXPORT_SYMBOL_GPL(__fput_sync);
+ 
+ void put_filp(struct file *file)
+ {
+@@ -308,6 +311,7 @@ void put_filp(struct file *file)
+ 		file_free(file);
+ 	}
+ }
+EXPORT_SYMBOL_GPL(put_filp);
+ 
+ void __init files_init(void)
+ { 
+diff -Nurp linux-4.9-aufs/fs/inode.c linux-4.9-aufs-mod/fs/inode.c
+--- linux-4.9-aufs/fs/inode.c	2016-12-31 00:31:52.379789379 +0200
+++ linux-4.9-aufs-mod/fs/inode.c	2016-12-31 00:32:35.154785422 +0200
+@@ -1651,6 +1651,7 @@ int update_time(struct inode *inode, str
+ 
+ 	return update_time(inode, time, flags);
+ }
+EXPORT_SYMBOL_GPL(update_time);
+ 
+ /**
+  *	touch_atime	-	update the access time
+diff -Nurp linux-4.9-aufs/fs/namespace.c linux-4.9-aufs-mod/fs/namespace.c
+--- linux-4.9-aufs/fs/namespace.c	2016-12-11 21:17:54.000000000 +0200
+++ linux-4.9-aufs-mod/fs/namespace.c	2016-12-31 00:32:35.154785422 +0200
+@@ -466,6 +466,7 @@ void __mnt_drop_write(struct vfsmount *m
+ 	mnt_dec_writers(real_mount(mnt));
+ 	preempt_enable();
+ }
+EXPORT_SYMBOL_GPL(__mnt_drop_write);
+ 
+ /**
+  * mnt_drop_write - give up write access to a mount
+@@ -1823,6 +1824,7 @@ int iterate_mounts(int (*f)(struct vfsmo
+ 	}
+ 	return 0;
+ }
+EXPORT_SYMBOL_GPL(iterate_mounts);
+ 
+ static void cleanup_group_ids(struct mount *mnt, struct mount *end)
+ {
+diff -Nurp linux-4.9-aufs/fs/notify/group.c linux-4.9-aufs-mod/fs/notify/group.c
+--- linux-4.9-aufs/fs/notify/group.c	2016-12-11 21:17:54.000000000 +0200
+++ linux-4.9-aufs-mod/fs/notify/group.c	2016-12-31 00:32:35.155785422 +0200
+@@ -22,6 +22,7 @@
+ #include <linux/srcu.h>
+ #include <linux/rculist.h>
+ #include <linux/wait.h>
+#include <linux/module.h>
+ 
+ #include <linux/fsnotify_backend.h>
+ #include "fsnotify.h"
+@@ -100,6 +101,7 @@ void fsnotify_get_group(struct fsnotify_
+ {
+ 	atomic_inc(&group->refcnt);
+ }
+EXPORT_SYMBOL_GPL(fsnotify_get_group);
+ 
+ /*
+  * Drop a reference to a group.  Free it if it's through.
+@@ -109,6 +111,7 @@ void fsnotify_put_group(struct fsnotify_
+ 	if (atomic_dec_and_test(&group->refcnt))
+ 		fsnotify_final_destroy_group(group);
+ }
+EXPORT_SYMBOL_GPL(fsnotify_put_group);
+ 
+ /*
+  * Create a new fsnotify_group and hold a reference for the group returned.
+@@ -137,6 +140,7 @@ struct fsnotify_group *fsnotify_alloc_gr
+ 
+ 	return group;
+ }
+EXPORT_SYMBOL_GPL(fsnotify_alloc_group);
+ 
+ int fsnotify_fasync(int fd, struct file *file, int on)
+ {
+diff -Nurp linux-4.9-aufs/fs/notify/mark.c linux-4.9-aufs-mod/fs/notify/mark.c
+--- linux-4.9-aufs/fs/notify/mark.c	2016-12-11 21:17:54.000000000 +0200
+++ linux-4.9-aufs-mod/fs/notify/mark.c	2016-12-31 00:32:35.155785422 +0200
+@@ -113,6 +113,7 @@ void fsnotify_put_mark(struct fsnotify_m
+ 		mark->free_mark(mark);
+ 	}
+ }
+EXPORT_SYMBOL_GPL(fsnotify_put_mark);
+ 
+ /* Calculate mask of events for a list of marks */
+ u32 fsnotify_recalc_mask(struct hlist_head *head)
+@@ -230,6 +231,7 @@ void fsnotify_destroy_mark(struct fsnoti
+ 	mutex_unlock(&group->mark_mutex);
+ 	fsnotify_free_mark(mark);
+ }
+EXPORT_SYMBOL_GPL(fsnotify_destroy_mark);
+ 
+ void fsnotify_destroy_marks(struct hlist_head *head, spinlock_t *lock)
+ {
+@@ -415,6 +417,7 @@ err:
+ 
+ 	return ret;
+ }
+EXPORT_SYMBOL_GPL(fsnotify_add_mark);
+ 
+ int fsnotify_add_mark(struct fsnotify_mark *mark, struct fsnotify_group *group,
+ 		      struct inode *inode, struct vfsmount *mnt, int allow_dups)
+@@ -521,6 +524,7 @@ void fsnotify_duplicate_mark(struct fsno
+ 	new->mask = old->mask;
+ 	new->free_mark = old->free_mark;
+ }
+EXPORT_SYMBOL_GPL(fsnotify_init_mark);
+ 
+ /*
+  * Nothing fancy, just initialize lists and locks and counters.
+diff -Nurp linux-4.9-aufs/fs/open.c linux-4.9-aufs-mod/fs/open.c
+--- linux-4.9-aufs/fs/open.c	2016-12-11 21:17:54.000000000 +0200
+++ linux-4.9-aufs-mod/fs/open.c	2016-12-31 00:32:35.155785422 +0200
+@@ -64,6 +64,7 @@ int do_truncate(struct dentry *dentry, l
+ 	inode_unlock(dentry->d_inode);
+ 	return ret;
+ }
+EXPORT_SYMBOL_GPL(do_truncate);
+ 
+ long vfs_truncate(const struct path *path, loff_t length)
+ {
+@@ -695,6 +696,7 @@ int open_check_o_direct(struct file *f)
+ 	}
+ 	return 0;
+ }
+EXPORT_SYMBOL_GPL(open_check_o_direct);
+ 
+ static int do_dentry_open(struct file *f,
+ 			  struct inode *inode,
+diff -Nurp linux-4.9-aufs/fs/read_write.c linux-4.9-aufs-mod/fs/read_write.c
+--- linux-4.9-aufs/fs/read_write.c	2016-12-31 00:31:52.380789379 +0200
+++ linux-4.9-aufs-mod/fs/read_write.c	2016-12-31 00:32:35.155785422 +0200
+@@ -525,6 +525,7 @@ vfs_readf_t vfs_readf(struct file *file)
+ 		return new_sync_read;
+ 	return ERR_PTR(-ENOSYS);
+ }
+EXPORT_SYMBOL_GPL(vfs_readf);
+ 
+ vfs_writef_t vfs_writef(struct file *file)
+ {
+@@ -536,6 +537,7 @@ vfs_writef_t vfs_writef(struct file *fil
+ 		return new_sync_write;
+ 	return ERR_PTR(-ENOSYS);
+ }
+EXPORT_SYMBOL_GPL(vfs_writef);
+ 
+ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t *pos)
+ {
+diff -Nurp linux-4.9-aufs/fs/splice.c linux-4.9-aufs-mod/fs/splice.c
+--- linux-4.9-aufs/fs/splice.c	2016-12-31 00:31:52.380789379 +0200
+++ linux-4.9-aufs-mod/fs/splice.c	2016-12-31 00:32:35.156785422 +0200
+@@ -868,6 +868,7 @@ long do_splice_from(struct pipe_inode_in
+ 
+ 	return splice_write(pipe, out, ppos, len, flags);
+ }
+EXPORT_SYMBOL_GPL(do_splice_from);
+ 
+ /*
+  * Attempt to initiate a splice from a file to a pipe.
+@@ -897,6 +898,7 @@ long do_splice_to(struct file *in, loff_
+ 
+ 	return splice_read(in, ppos, pipe, len, flags);
+ }
+EXPORT_SYMBOL_GPL(do_splice_to);
+ 
+ /**
+  * splice_direct_to_actor - splices data directly between two non-pipes
+diff -Nurp linux-4.9-aufs/fs/xattr.c linux-4.9-aufs-mod/fs/xattr.c
+--- linux-4.9-aufs/fs/xattr.c	2016-12-11 21:17:54.000000000 +0200
+++ linux-4.9-aufs-mod/fs/xattr.c	2016-12-31 00:32:35.156785422 +0200
+@@ -296,6 +296,7 @@ vfs_getxattr_alloc(struct dentry *dentry
+ 	*xattr_value = value;
+ 	return error;
+ }
+EXPORT_SYMBOL_GPL(vfs_getxattr_alloc);
+ 
+ ssize_t
+ __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
+diff -Nurp linux-4.9-aufs/kernel/task_work.c linux-4.9-aufs-mod/kernel/task_work.c
+--- linux-4.9-aufs/kernel/task_work.c	2016-12-11 21:17:54.000000000 +0200
+++ linux-4.9-aufs-mod/kernel/task_work.c	2016-12-31 00:32:35.156785422 +0200
+@@ -119,3 +119,4 @@ void task_work_run(void)
+ 		} while (work);
+ 	}
+ }
+EXPORT_SYMBOL_GPL(task_work_run);
+diff -Nurp linux-4.9-aufs/security/commoncap.c linux-4.9-aufs-mod/security/commoncap.c
+--- linux-4.9-aufs/security/commoncap.c	2016-12-11 21:17:54.000000000 +0200
+++ linux-4.9-aufs-mod/security/commoncap.c	2016-12-31 00:32:35.156785422 +0200
+@@ -1061,12 +1061,14 @@ int cap_mmap_addr(unsigned long addr)
+ 	}
+ 	return ret;
+ }
+EXPORT_SYMBOL_GPL(cap_mmap_addr);
+ 
+ int cap_mmap_file(struct file *file, unsigned long reqprot,
+ 		  unsigned long prot, unsigned long flags)
+ {
+ 	return 0;
+ }
+EXPORT_SYMBOL_GPL(cap_mmap_file);
+ 
+ #ifdef CONFIG_SECURITY
+ 
+diff -Nurp linux-4.9-aufs/security/device_cgroup.c linux-4.9-aufs-mod/security/device_cgroup.c
+--- linux-4.9-aufs/security/device_cgroup.c	2016-12-11 21:17:54.000000000 +0200
+++ linux-4.9-aufs-mod/security/device_cgroup.c	2016-12-31 00:32:35.156785422 +0200
+@@ -7,6 +7,7 @@
+ #include <linux/device_cgroup.h>
+ #include <linux/cgroup.h>
+ #include <linux/ctype.h>
+#include <linux/export.h>
+ #include <linux/list.h>
+ #include <linux/uaccess.h>
+ #include <linux/seq_file.h>
+@@ -849,6 +850,7 @@ int __devcgroup_inode_permission(struct
+ 	return __devcgroup_check_permission(type, imajor(inode), iminor(inode),
+ 			access);
+ }
+EXPORT_SYMBOL_GPL(__devcgroup_inode_permission);
+ 
+ int devcgroup_inode_mknod(int mode, dev_t dev)
+ {
+diff -Nurp linux-4.9-aufs/security/security.c linux-4.9-aufs-mod/security/security.c
+--- linux-4.9-aufs/security/security.c	2016-12-11 21:17:54.000000000 +0200
+++ linux-4.9-aufs-mod/security/security.c	2016-12-31 00:32:35.157785422 +0200
+@@ -443,6 +443,7 @@ int security_path_rmdir(const struct pat
+ 		return 0;
+ 	return call_int_hook(path_rmdir, 0, dir, dentry);
+ }
+EXPORT_SYMBOL_GPL(security_path_rmdir);
+ 
+ int security_path_unlink(const struct path *dir, struct dentry *dentry)
+ {
+@@ -459,6 +460,7 @@ int security_path_symlink(const struct p
+ 		return 0;
+ 	return call_int_hook(path_symlink, 0, dir, dentry, old_name);
+ }
+EXPORT_SYMBOL_GPL(security_path_symlink);
+ 
+ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
+ 		       struct dentry *new_dentry)
+@@ -467,6 +469,7 @@ int security_path_link(struct dentry *ol
+ 		return 0;
+ 	return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
+ }
+EXPORT_SYMBOL_GPL(security_path_link);
+ 
+ int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
+ 			 const struct path *new_dir, struct dentry *new_dentry,
+@@ -494,6 +497,7 @@ int security_path_truncate(const struct
+ 		return 0;
+ 	return call_int_hook(path_truncate, 0, path);
+ }
+EXPORT_SYMBOL_GPL(security_path_truncate);
+ 
+ int security_path_chmod(const struct path *path, umode_t mode)
+ {
+@@ -501,6 +505,7 @@ int security_path_chmod(const struct pat
+ 		return 0;
+ 	return call_int_hook(path_chmod, 0, path, mode);
+ }
+EXPORT_SYMBOL_GPL(security_path_chmod);
+ 
+ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
+ {
+@@ -508,6 +513,7 @@ int security_path_chown(const struct pat
+ 		return 0;
+ 	return call_int_hook(path_chown, 0, path, uid, gid);
+ }
+EXPORT_SYMBOL_GPL(security_path_chown);
+ 
+ int security_path_chroot(const struct path *path)
+ {
+@@ -593,6 +599,7 @@ int security_inode_readlink(struct dentr
+ 		return 0;
+ 	return call_int_hook(inode_readlink, 0, dentry);
+ }
+EXPORT_SYMBOL_GPL(security_inode_readlink);
+ 
+ int security_inode_follow_link(struct dentry *dentry, struct inode *inode,
+ 			       bool rcu)
+@@ -608,6 +615,7 @@ int security_inode_permission(struct ino
+ 		return 0;
+ 	return call_int_hook(inode_permission, 0, inode, mask);
+ }
+EXPORT_SYMBOL_GPL(security_inode_permission);
+ 
+ int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
+ {
+@@ -779,6 +787,7 @@ int security_file_permission(struct file
+ 
+ 	return fsnotify_perm(file, mask);
+ }
+EXPORT_SYMBOL_GPL(security_file_permission);
+ 
+ int security_file_alloc(struct file *file)
+ {
+@@ -838,6 +847,7 @@ int security_mmap_file(struct file *file
+ 		return ret;
+ 	return ima_file_mmap(file, prot);
+ }
+EXPORT_SYMBOL_GPL(security_mmap_file);
+ 
+ int security_mmap_addr(unsigned long addr)
+ {
@@ -1,338 +0,0 @@
-
- fs/aufs/Kconfig          |    2 +-
- fs/dcache.c              |    1 +
- fs/file_table.c          |    2 ++
- fs/inode.c               |    2 ++
- fs/namespace.c           |    2 ++
- fs/notify/group.c        |    4 ++++
- fs/notify/mark.c         |    4 ++++
- fs/open.c                |    2 ++
- fs/read_write.c          |    2 ++
- fs/splice.c              |    2 ++
- security/commoncap.c     |    2 ++
- security/device_cgroup.c |    2 ++
- 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
-@@ -1,5 +1,5 @@
- config AUFS_FS
-	bool "Aufs (Advanced multi layered unification filesystem) support"
-+	tristate "Aufs (Advanced multi layered unification filesystem) support"
- 	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:
- 	seq = 1;
- 	goto again;
- }
-+EXPORT_SYMBOL_GPL(d_walk);
- 
- /*
-  * 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
-@@ -147,6 +147,7 @@ over:
- 	}
- 	return ERR_PTR(-ENFILE);
- }
-+EXPORT_SYMBOL(get_empty_filp);
- 
- /**
-  * alloc_file - allocate and initialize a 'struct file'
-@@ -308,6 +309,7 @@ void put_filp(struct file *file)
- 		file_free(file);
- 	}
- }
-+EXPORT_SYMBOL(put_filp);
- 
- void __init files_init(unsigned long mempages)
- { 
-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
-@@ -58,6 +58,7 @@ static struct hlist_head *inode_hashtabl
- static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock);
- 
- __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock);
-+EXPORT_SYMBOL(inode_sb_list_lock);
- 
- /*
-  * Empty aops. Can be used for the cases where the user does not
-@@ -1575,6 +1576,7 @@ static int update_time(struct inode *ino
- 
- 	return update_time(inode, time, flags);
- }
-+EXPORT_SYMBOL(update_time);
- 
- /**
-  *	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
-@@ -463,6 +463,7 @@ void __mnt_drop_write(struct vfsmount *m
- 	mnt_dec_writers(real_mount(mnt));
- 	preempt_enable();
- }
-+EXPORT_SYMBOL_GPL(__mnt_drop_write);
- 
- /**
-  * mnt_drop_write - give up write access to a mount
-@@ -1768,6 +1769,7 @@ int iterate_mounts(int (*f)(struct vfsmo
- 	}
- 	return 0;
- }
-+EXPORT_SYMBOL(iterate_mounts);
- 
- 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
-@@ -22,6 +22,7 @@
- #include <linux/srcu.h>
- #include <linux/rculist.h>
- #include <linux/wait.h>
-+#include <linux/module.h>
- 
- #include <linux/fsnotify_backend.h>
- #include "fsnotify.h"
-@@ -72,6 +73,7 @@ void fsnotify_get_group(struct fsnotify_
- {
- 	atomic_inc(&group->refcnt);
- }
-+EXPORT_SYMBOL(fsnotify_get_group);
- 
- /*
-  * Drop a reference to a group.  Free it if it's through.
-@@ -81,6 +83,7 @@ void fsnotify_put_group(struct fsnotify_
- 	if (atomic_dec_and_test(&group->refcnt))
- 		fsnotify_final_destroy_group(group);
- }
-+EXPORT_SYMBOL(fsnotify_put_group);
- 
- /*
-  * Create a new fsnotify_group and hold a reference for the group returned.
-@@ -109,6 +112,7 @@ struct fsnotify_group *fsnotify_alloc_gr
- 
- 	return group;
- }
-+EXPORT_SYMBOL(fsnotify_alloc_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
-@@ -109,6 +109,7 @@ void fsnotify_put_mark(struct fsnotify_m
- 		mark->free_mark(mark);
- 	}
- }
-+EXPORT_SYMBOL(fsnotify_put_mark);
- 
- /* Calculate mask of events for a list of marks */
- u32 fsnotify_recalc_mask(struct hlist_head *head)
-@@ -202,6 +203,7 @@ void fsnotify_destroy_mark(struct fsnoti
- 	fsnotify_destroy_mark_locked(mark, group);
- 	mutex_unlock(&group->mark_mutex);
- }
-+EXPORT_SYMBOL(fsnotify_destroy_mark);
- 
- /*
-  * Destroy all marks in the given list. The marks must be already detached from
-@@ -386,6 +388,7 @@ int fsnotify_add_mark(struct fsnotify_ma
- 	mutex_unlock(&group->mark_mutex);
- 	return ret;
- }
-+EXPORT_SYMBOL(fsnotify_add_mark);
- 
- /*
-  * Given a list of marks, find the mark associated with given group. If found
-@@ -455,6 +458,7 @@ void fsnotify_init_mark(struct fsnotify_
- 	atomic_set(&mark->refcnt, 1);
- 	mark->free_mark = free_mark;
- }
-+EXPORT_SYMBOL(fsnotify_init_mark);
- 
- 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
- 	mutex_unlock(&dentry->d_inode->i_mutex);
- 	return ret;
- }
-+EXPORT_SYMBOL(do_truncate);
- 
- long vfs_truncate(struct path *path, loff_t length)
- {
-@@ -676,6 +677,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
-@@ -504,6 +504,7 @@ vfs_readf_t vfs_readf(struct file *file)
- 		return new_sync_read;
- 	return ERR_PTR(-ENOSYS);
- }
-+EXPORT_SYMBOL(vfs_readf);
- 
- vfs_writef_t vfs_writef(struct file *file)
- {
-@@ -515,6 +516,7 @@ vfs_writef_t vfs_writef(struct file *fil
- 		return new_sync_write;
- 	return ERR_PTR(-ENOSYS);
- }
-+EXPORT_SYMBOL(vfs_writef);
- 
- 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
- 
- 	return splice_write(pipe, out, ppos, len, flags);
- }
-+EXPORT_SYMBOL(do_splice_from);
- 
- /*
-  * Attempt to initiate a splice from a file to a pipe.
-@@ -1140,6 +1141,7 @@ long do_splice_to(struct file *in, loff_
- 
- 	return splice_read(in, ppos, pipe, len, flags);
- }
-+EXPORT_SYMBOL(do_splice_to);
- 
- /**
-  * 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)
- 	}
- 	return ret;
- }
-+EXPORT_SYMBOL(cap_mmap_addr);
- 
- int cap_mmap_file(struct file *file, unsigned long reqprot,
- 		  unsigned long prot, unsigned long flags)
- {
- 	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
-@@ -7,6 +7,7 @@
- #include <linux/device_cgroup.h>
- #include <linux/cgroup.h>
- #include <linux/ctype.h>
-+#include <linux/export.h>
- #include <linux/list.h>
- #include <linux/uaccess.h>
- #include <linux/seq_file.h>
-@@ -849,6 +850,7 @@ int __devcgroup_inode_permission(struct
- 	return __devcgroup_check_permission(type, imajor(inode), iminor(inode),
- 			access);
- }
-+EXPORT_SYMBOL(__devcgroup_inode_permission);
- 
- 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
- 		return 0;
- 	return security_ops->path_rmdir(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
- 		return 0;
- 	return security_ops->path_symlink(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
- 		return 0;
- 	return security_ops->path_link(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 *
- 		return 0;
- 	return security_ops->path_truncate(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
- 		return 0;
- 	return security_ops->path_chmod(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
- 		return 0;
- 	return security_ops->path_chown(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
- 		return 0;
- 	return security_ops->inode_readlink(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
- 		return 0;
- 	return security_ops->inode_permission(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
- 
- 	return fsnotify_perm(file, mask);
- }
-+EXPORT_SYMBOL(security_file_permission);
- 
- int security_file_alloc(struct file *file)
- {
-@@ -775,6 +784,7 @@ int security_mmap_file(struct file *file
- 		return ret;
- 	return ima_file_mmap(file, prot);
- }
-+EXPORT_SYMBOL(security_mmap_file);
- 
- int security_mmap_addr(unsigned long addr)
- {
@@ -0,0 +1,44 @@
+From e522751d605d99a81508e58390a8f51ee96fb662 Mon Sep 17 00:00:00 2001
+From: Tomasz Majchrzak <tomasz.majchrzak@intel.com>
+Date: Tue, 29 Nov 2016 15:18:20 +0100
+Subject: [PATCH] seq_file: reset iterator to first record for zero offset
+
+If kernfs file is empty on a first read, successive read operations
+using the same file descriptor will return no data, even when data is
+available. Default kernfs 'seq_next' implementation advances iterator
+position even when next object is not there. Kernfs 'seq_start' for
+following requests will not return iterator as position is already on
+the second object.
+
+This defect doesn't allow to monitor badblocks sysfs files from MD raid.
+They are initially empty but if data appears at some stage, userspace is
+not able to read it.
+
+Signed-off-by: Tomasz Majchrzak <tomasz.majchrzak@intel.com>
+Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
+Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+---
+ fs/seq_file.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/fs/seq_file.c b/fs/seq_file.c
+index 368bfb9..a11f271 100644
+--- a/fs/seq_file.c
+++ b/fs/seq_file.c
+@@ -190,6 +190,13 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
+ 	 */
+ 	m->version = file->f_version;
+ 
+	/*
+	 * if request is to read from zero offset, reset iterator to first
+	 * record as it might have been already advanced by previous requests
+	 */
+	if (*ppos == 0)
+		m->index = 0;
+
+ 	/* Don't assume *ppos is where we left it */
+ 	if (unlikely(*ppos != m->read_pos)) {
+ 		while ((err = traverse(m, *ppos)) == -EAGAIN)
+-- 
+2.10.2
+
@@ -0,0 +1,97 @@
+From 8726f2faa371514fba2f594d799db95203dfeee0 Mon Sep 17 00:00:00 2001
+From: Francisco Jerez <currojerez@riseup.net>
+Date: Thu, 12 Jan 2017 12:44:54 +0200
+Subject: drm/i915: Remove WaDisableLSQCROPERFforOCL KBL workaround.
+
+The WaDisableLSQCROPERFforOCL workaround has the side effect of
+disabling an L3SQ optimization that has huge performance implications
+and is unlikely to be necessary for the correct functioning of usual
+graphic workloads.  Userspace is free to re-enable the workaround on
+demand, and is generally in a better position to determine whether the
+workaround is necessary than the DRM is (e.g. only during the
+execution of compute kernels that rely on both L3 fences and HDC R/W
+requests).
+
+The same workaround seems to apply to BDW (at least to production
+stepping G1) and SKL as well (the internal workaround database claims
+that it does for all steppings, while the BSpec workaround table only
+mentions pre-production steppings), but the DRM doesn't do anything
+beyond whitelisting the L3SQCREG4 register so userspace can enable it
+when it sees fit.  Do the same on KBL platforms.
+
+Improves performance of the GFXBench4 gl_manhattan31 benchmark by 60%,
+and gl_4 (AKA car chase) by 14% on a KBL GT2 running Mesa master --
+This is followed by a regression of 35% and 10% respectively for the
+same benchmarks and platform caused by my recent patch series
+switching userspace to use the dataport constant cache instead of the
+sampler to implement uniform pull constant loads, which caused us to
+hit more heavily the L3 cache (and on platforms other than KBL had the
+opposite effect of improving performance of the same two benchmarks).
+The overall effect on KBL of this change combined with the recent
+userspace change is respectively 4.6% and 2.6%.  SynMark2 OglShMapPcf
+was affected by the constant cache changes (though it improved as it
+did on other platforms rather than regressing), but is not
+significantly affected by this patch (with statistical significance of
+5% and sample size 20).
+
+v2: Drop some more code to avoid unused variable warning.
+
+Fixes: 738fa1b3123f ("drm/i915/kbl: Add WaDisableLSQCROPERFforOCL")
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99256
+Signed-off-by: Francisco Jerez <currojerez@riseup.net>
+Cc: Matthew Auld <matthew.william.auld@gmail.com>
+Cc: Eero Tamminen <eero.t.tamminen@intel.com>
+Cc: Jani Nikula <jani.nikula@intel.com>
+Cc: Mika Kuoppala <mika.kuoppala@intel.com>
+Cc: beignet@lists.freedesktop.org
+Cc: <stable@vger.kernel.org> # v4.7+
+Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
+[Removed double Fixes tag]
+Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
+Link: http://patchwork.freedesktop.org/patch/msgid/1484217894-20505-1-git-send-email-mika.kuoppala@intel.com
+
+diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
+index db714dc..8acab87 100644
+--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
+@@ -970,18 +970,8 @@ static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *engine,
+ 						uint32_t *batch,
+ 						uint32_t index)
+ {
+-	struct drm_i915_private *dev_priv = engine->i915;
+ 	uint32_t l3sqc4_flush = (0x40400000 | GEN8_LQSC_FLUSH_COHERENT_LINES);
+ 
+-	/*
+-	 * WaDisableLSQCROPERFforOCL:kbl
+-	 * This WA is implemented in skl_init_clock_gating() but since
+-	 * this batch updates GEN8_L3SQCREG4 with default value we need to
+-	 * set this bit here to retain the WA during flush.
+-	 */
+-	if (IS_KBL_REVID(dev_priv, 0, KBL_REVID_E0))
+-		l3sqc4_flush |= GEN8_LQSC_RO_PERF_DIS;
+-
+ 	wa_ctx_emit(batch, index, (MI_STORE_REGISTER_MEM_GEN8 |
+ 				   MI_SRM_LRM_GLOBAL_GTT));
+ 	wa_ctx_emit_reg(batch, index, GEN8_L3SQCREG4);
+diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
+index ab83fc2..49fa800 100644
+--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
+@@ -1095,14 +1095,6 @@ static int kbl_init_workarounds(struct intel_engine_cs *engine)
+ 		WA_SET_BIT_MASKED(HDC_CHICKEN0,
+ 				  HDC_FENCE_DEST_SLM_DISABLE);
+ 
+-	/* GEN8_L3SQCREG4 has a dependency with WA batch so any new changes
+-	 * involving this register should also be added to WA batch as required.
+-	 */
+-	if (IS_KBL_REVID(dev_priv, 0, KBL_REVID_E0))
+-		/* WaDisableLSQCROPERFforOCL:kbl */
+-		I915_WRITE(GEN8_L3SQCREG4, I915_READ(GEN8_L3SQCREG4) |
+-			   GEN8_LQSC_RO_PERF_DIS);
+-
+ 	/* WaToEnableHwFixForPushConstHWBug:kbl */
+ 	if (IS_KBL_REVID(dev_priv, KBL_REVID_C0, REVID_FOREVER))
+ 		WA_SET_BIT_MASKED(COMMON_SLICE_CHICKEN2,
+-- 
+cgit v0.10.2
+
@@ -0,0 +1,127 @@
+From a117f378f44150e6d13d2f19740fb757425b651f Mon Sep 17 00:00:00 2001
+From: Jani Nikula <jani.nikula@intel.com>
+Date: Fri, 16 Sep 2016 16:59:44 +0300
+Subject: drm/i915/skl: drop workarounds for A0 and B0 revisions
+
+Pre-production hardware is not supported.
+
+Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
+Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+Link: http://patchwork.freedesktop.org/patch/msgid/7929af62a68504c84038a8db1625bd96ebaa9e6f.1474034059.git.jani.nikula@intel.com
+
+diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
+index 0568fb5..57da2b7 100644
+--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
+@@ -1299,10 +1299,6 @@ bool intel_dp_source_supports_hbr2(struct intel_dp *intel_dp)
+ 	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
+ 	struct drm_device *dev = dig_port->base.base.dev;
+ 
+-	/* WaDisableHBR2:skl */
+-	if (IS_SKL_REVID(dev, 0, SKL_REVID_B0))
+-		return false;
+-
+ 	if ((IS_HASWELL(dev) && !IS_HSW_ULX(dev)) || IS_BROADWELL(dev) ||
+ 	    (INTEL_INFO(dev)->gen >= 9))
+ 		return true;
+diff --git a/drivers/gpu/drm/i915/intel_dp_link_training.c b/drivers/gpu/drm/i915/intel_dp_link_training.c
+index c438b02..0048b52 100644
+--- a/drivers/gpu/drm/i915/intel_dp_link_training.c
+++ b/drivers/gpu/drm/i915/intel_dp_link_training.c
+@@ -225,9 +225,6 @@ static u32 intel_dp_training_pattern(struct intel_dp *intel_dp)
+ 	 * Intel platforms that support HBR2 also support TPS3. TPS3 support is
+ 	 * also mandatory for downstream devices that support HBR2. However, not
+ 	 * all sinks follow the spec.
+-	 *
+-	 * Due to WaDisableHBR2 SKL < B0 is the only exception where TPS3 is
+-	 * supported in source but still not enabled.
+ 	 */
+ 	source_tps3 = intel_dp_source_supports_hbr2(intel_dp);
+ 	sink_tps3 = drm_dp_tps3_supported(intel_dp->dpcd);
+diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
+index 6fd39ef..acc1dbd 100644
+--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
+@@ -375,9 +375,8 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)
+ 	/* Enable MIA caching. GuC clock gating is disabled. */
+ 	I915_WRITE(GUC_SHIM_CONTROL, GUC_SHIM_CONTROL_VALUE);
+ 
+-	/* WaDisableMinuteIaClockGating:skl,bxt */
+-	if (IS_SKL_REVID(dev, 0, SKL_REVID_B0) ||
+-	    IS_BXT_REVID(dev, 0, BXT_REVID_A1)) {
+	/* WaDisableMinuteIaClockGating:bxt */
+	if (IS_BXT_REVID(dev, 0, BXT_REVID_A1)) {
+ 		I915_WRITE(GUC_SHIM_CONTROL, (I915_READ(GUC_SHIM_CONTROL) &
+ 					      ~GUC_ENABLE_MIA_CLOCK_GATING));
+ 	}
+diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
+index 39417b7..47f7afa 100644
+--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
+@@ -269,8 +269,7 @@ logical_ring_init_platform_invariants(struct intel_engine_cs *engine)
+ 	struct drm_i915_private *dev_priv = engine->i915;
+ 
+ 	engine->disable_lite_restore_wa =
+-		(IS_SKL_REVID(dev_priv, 0, SKL_REVID_B0) ||
+-		 IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) &&
+		IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1) &&
+ 		(engine->id == VCS || engine->id == VCS2);
+ 
+ 	engine->ctx_desc_template = GEN8_CTX_VALID;
+@@ -1068,9 +1067,8 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *engine,
+ {
+ 	uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS);
+ 
+-	/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */
+-	if (IS_SKL_REVID(engine->i915, 0, SKL_REVID_B0) ||
+-	    IS_BXT_REVID(engine->i915, 0, BXT_REVID_A1)) {
+	/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:bxt */
+	if (IS_BXT_REVID(engine->i915, 0, BXT_REVID_A1)) {
+ 		wa_ctx_emit(batch, index, MI_LOAD_REGISTER_IMM(1));
+ 		wa_ctx_emit_reg(batch, index, GEN9_SLICE_COMMON_ECO_CHICKEN0);
+ 		wa_ctx_emit(batch, index,
+diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
+index 7a74750..2faf64f 100644
+--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
+@@ -851,15 +851,13 @@ static int gen9_init_workarounds(struct intel_engine_cs *engine)
+ 	WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
+ 			  GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
+ 
+-	/* WaDisableDgMirrorFixInHalfSliceChicken5:skl,bxt */
+-	if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_B0) ||
+-	    IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1))
+	/* WaDisableDgMirrorFixInHalfSliceChicken5:bxt */
+	if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1))
+ 		WA_CLR_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN5,
+ 				  GEN9_DG_MIRROR_FIX_ENABLE);
+ 
+-	/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */
+-	if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_B0) ||
+-	    IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) {
+	/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:bxt */
+	if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) {
+ 		WA_SET_BIT_MASKED(GEN7_COMMON_SLICE_CHICKEN1,
+ 				  GEN9_RHWO_OPTIMIZATION_DISABLE);
+ 		/*
+@@ -1023,15 +1021,8 @@ static int skl_init_workarounds(struct intel_engine_cs *engine)
+ 			   GEN8_LQSC_RO_PERF_DIS);
+ 
+ 	/* WaEnableGapsTsvCreditFix:skl */
+-	if (IS_SKL_REVID(dev_priv, SKL_REVID_C0, REVID_FOREVER)) {
+-		I915_WRITE(GEN8_GARBCNTL, (I915_READ(GEN8_GARBCNTL) |
+-					   GEN9_GAPS_TSV_CREDIT_DISABLE));
+-	}
+-
+-	/* WaDisablePowerCompilerClockGating:skl */
+-	if (IS_SKL_REVID(dev_priv, SKL_REVID_B0, SKL_REVID_B0))
+-		WA_SET_BIT_MASKED(HIZ_CHICKEN,
+-				  BDW_HIZ_POWER_COMPILER_CLOCK_GATING_DISABLE);
+	I915_WRITE(GEN8_GARBCNTL, (I915_READ(GEN8_GARBCNTL) |
+				   GEN9_GAPS_TSV_CREDIT_DISABLE));
+ 
+ 	/* WaBarrierPerformanceFixDisable:skl */
+ 	if (IS_SKL_REVID(dev_priv, SKL_REVID_C0, SKL_REVID_D0))
+-- 
+cgit v0.10.2
+
@@ -0,0 +1,86 @@
+From 9fc736e833d226853fd53843e35d6a1d542394ed Mon Sep 17 00:00:00 2001
+From: Jani Nikula <jani.nikula@intel.com>
+Date: Fri, 16 Sep 2016 16:59:46 +0300
+Subject: drm/i915/skl: drop workarounds for D0 revision
+
+Pre-production hardware is not supported.
+
+Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
+Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+Link: http://patchwork.freedesktop.org/patch/msgid/d28d21ceddeec226b5d1a20a7382bee9a72709a4.1474034059.git.jani.nikula@intel.com
+
+diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
+index 47f7afa..ca649cc 100644
+--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
+@@ -994,9 +994,8 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *engine,
+ 	struct drm_i915_private *dev_priv = engine->i915;
+ 	uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS);
+ 
+-	/* WaDisableCtxRestoreArbitration:skl,bxt */
+-	if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_D0) ||
+-	    IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1))
+	/* WaDisableCtxRestoreArbitration:bxt */
+	if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1))
+ 		wa_ctx_emit(batch, index, MI_ARB_ON_OFF | MI_ARB_DISABLE);
+ 
+ 	/* WaFlushCoherentL3CacheLinesAtContextSwitch:skl,bxt */
+@@ -1095,9 +1094,8 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *engine,
+ 		wa_ctx_emit(batch, index, MI_NOOP);
+ 	}
+ 
+-	/* WaDisableCtxRestoreArbitration:skl,bxt */
+-	if (IS_SKL_REVID(engine->i915, 0, SKL_REVID_D0) ||
+-	    IS_BXT_REVID(engine->i915, 0, BXT_REVID_A1))
+	/* WaDisableCtxRestoreArbitration:bxt */
+	if (IS_BXT_REVID(engine->i915, 0, BXT_REVID_A1))
+ 		wa_ctx_emit(batch, index, MI_ARB_ON_OFF | MI_ARB_ENABLE);
+ 
+ 	wa_ctx_emit(batch, index, MI_BATCH_BUFFER_END);
+diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
+index 2df06b7..a860c40 100644
+--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
+@@ -5335,8 +5335,7 @@ static void gen9_enable_rc6(struct drm_i915_private *dev_priv)
+ 		rc6_mask = GEN6_RC_CTL_RC6_ENABLE;
+ 	DRM_INFO("RC6 %s\n", onoff(rc6_mask & GEN6_RC_CTL_RC6_ENABLE));
+ 	/* WaRsUseTimeoutMode */
+-	if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_D0) ||
+-	    IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) {
+	if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) {
+ 		I915_WRITE(GEN6_RC6_THRESHOLD, 625); /* 800us */
+ 		I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
+ 			   GEN7_RC_CTL_TO_MODE |
+diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
+index 474ce84..6880082 100644
+--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
+@@ -1000,10 +1000,8 @@ static int skl_init_workarounds(struct intel_engine_cs *engine)
+ 	 * until D0 which is the default case so this is equivalent to
+ 	 * !WaDisablePerCtxtPreemptionGranularityControl:skl
+ 	 */
+-	if (IS_SKL_REVID(dev_priv, SKL_REVID_E0, REVID_FOREVER)) {
+-		I915_WRITE(GEN7_FF_SLICE_CS_CHICKEN1,
+-			   _MASKED_BIT_ENABLE(GEN9_FFSC_PERCTX_PREEMPT_CTRL));
+-	}
+	I915_WRITE(GEN7_FF_SLICE_CS_CHICKEN1,
+		   _MASKED_BIT_ENABLE(GEN9_FFSC_PERCTX_PREEMPT_CTRL));
+ 
+ 	if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_E0)) {
+ 		/* WaDisableChickenBitTSGBarrierAckForFFSliceCS:skl */
+@@ -1023,12 +1021,6 @@ static int skl_init_workarounds(struct intel_engine_cs *engine)
+ 	I915_WRITE(GEN8_GARBCNTL, (I915_READ(GEN8_GARBCNTL) |
+ 				   GEN9_GAPS_TSV_CREDIT_DISABLE));
+ 
+-	/* WaBarrierPerformanceFixDisable:skl */
+-	if (IS_SKL_REVID(dev_priv, SKL_REVID_C0, SKL_REVID_D0))
+-		WA_SET_BIT_MASKED(HDC_CHICKEN0,
+-				  HDC_FENCE_DEST_SLM_DISABLE |
+-				  HDC_BARRIER_PERFORMANCE_DISABLE);
+-
+ 	/* WaDisableSbeCacheDispatchPortSharing:skl */
+ 	if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_F0))
+ 		WA_SET_BIT_MASKED(
+-- 
+cgit v0.10.2
+
@@ -0,0 +1,59 @@
+From 3be192e92ddcad15f7bf6b4b9e3f195eb8c1fe76 Mon Sep 17 00:00:00 2001
+From: Jani Nikula <jani.nikula@intel.com>
+Date: Fri, 16 Sep 2016 16:59:47 +0300
+Subject: drm/i915/skl: drop workarounds for E0 revision
+
+Pre-production hardware is not supported.
+
+Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
+Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+Link: http://patchwork.freedesktop.org/patch/msgid/0633a02177195703502ef2396aab03efc0314334.1474034059.git.jani.nikula@intel.com
+
+diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
+index ca649cc..2d8eb2e 100644
+--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
+@@ -845,13 +845,12 @@ static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *engine,
+ 	uint32_t l3sqc4_flush = (0x40400000 | GEN8_LQSC_FLUSH_COHERENT_LINES);
+ 
+ 	/*
+-	 * WaDisableLSQCROPERFforOCL:skl,kbl
+	 * WaDisableLSQCROPERFforOCL:kbl
+ 	 * This WA is implemented in skl_init_clock_gating() but since
+ 	 * this batch updates GEN8_L3SQCREG4 with default value we need to
+ 	 * set this bit here to retain the WA during flush.
+ 	 */
+-	if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_E0) ||
+-	    IS_KBL_REVID(dev_priv, 0, KBL_REVID_E0))
+	if (IS_KBL_REVID(dev_priv, 0, KBL_REVID_E0))
+ 		l3sqc4_flush |= GEN8_LQSC_RO_PERF_DIS;
+ 
+ 	wa_ctx_emit(batch, index, (MI_STORE_REGISTER_MEM_GEN8 |
+diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
+index 6880082..68dc27f 100644
+--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
+@@ -1003,20 +1003,6 @@ static int skl_init_workarounds(struct intel_engine_cs *engine)
+ 	I915_WRITE(GEN7_FF_SLICE_CS_CHICKEN1,
+ 		   _MASKED_BIT_ENABLE(GEN9_FFSC_PERCTX_PREEMPT_CTRL));
+ 
+-	if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_E0)) {
+-		/* WaDisableChickenBitTSGBarrierAckForFFSliceCS:skl */
+-		I915_WRITE(FF_SLICE_CS_CHICKEN2,
+-			   _MASKED_BIT_ENABLE(GEN9_TSG_BARRIER_ACK_DISABLE));
+-	}
+-
+-	/* GEN8_L3SQCREG4 has a dependency with WA batch so any new changes
+-	 * involving this register should also be added to WA batch as required.
+-	 */
+-	if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_E0))
+-		/* WaDisableLSQCROPERFforOCL:skl */
+-		I915_WRITE(GEN8_L3SQCREG4, I915_READ(GEN8_L3SQCREG4) |
+-			   GEN8_LQSC_RO_PERF_DIS);
+-
+ 	/* WaEnableGapsTsvCreditFix:skl */
+ 	I915_WRITE(GEN8_GARBCNTL, (I915_READ(GEN8_GARBCNTL) |
+ 				   GEN9_GAPS_TSV_CREDIT_DISABLE));
+-- 
+cgit v0.10.2
+
@@ -4112,11 +4112,11 @@ head: c99566fb810c9d8cae5e9cd39d1772b55e2f514c
 +
 +	return 0;
 +}
--- linux/drivers/gpu/drm/Kconfig.gpu-drm-mach64.orig	2014-03-08 18:52:34.979768492 +0200
-+++ linux/drivers/gpu/drm/Kconfig	2014-03-08 18:55:18.769681473 +0200
-@@ -130,6 +130,17 @@ config DRM_I810
- 
- source "drivers/gpu/drm/i915/Kconfig"
+--- linux/drivers/gpu/drm/Kconfig.gpu-drm-mach64.orig
+++ linux/drivers/gpu/drm/Kconfig
+@@ -267,6 +267,17 @@ config DRM_I810
+ 	  selected, the module will be called i810.  AGP support is required
+ 	  for this driver to work.
 
 +config DRM_MACH64
 +	tristate "ATI Rage Pro (Mach64)"
@@ -4134,11 +4134,11 @@ 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/
+@@ -47,6 +47,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/
- obj-$(CONFIG_DRM_I915)  += i915/
+ obj-$(CONFIG_DRM_I915)	+= i915/
@@ -0,0 +1,10 @@
+--- linux-4.4/net/ipv4/netfilter/ipt_IFWLOG.c~	2016-01-24 13:19:13.233713998 +0100
+++ linux-4.4/net/ipv4/netfilter/ipt_IFWLOG.c	2016-01-24 20:49:10.145823623 +0100
+@@ -74,7 +74,6 @@
+ 		return;
+ 	}
+ 
+-nlmsg_failure:
+ 	kfree_skb(skb);
+ 	PRINTR(KERN_WARNING "IFWLOG: Error sending netlink packet\n");
+ }
@@ -0,0 +1,85 @@
+
+Make defines psd specific so they dont redefine in-kernel defines like
+HASH_SIZE.
+
+Signed-off-by: Thomas Backlund <tmb@mageia.org>
+
+
+ include/linux/netfilter_ipv4/ipt_psd.h |   14 +++++++-------
+ net/ipv4/netfilter/ipt_psd.c           |   14 +++++++-------
+ 2 files changed, 14 insertions(+), 14 deletions(-)
+
+diff -Nurp linux-4.9.5-psd/include/linux/netfilter_ipv4/ipt_psd.h linux-4.9.5-psd-fix/include/linux/netfilter_ipv4/ipt_psd.h
+--- linux-4.9.5-psd/include/linux/netfilter_ipv4/ipt_psd.h	2017-01-20 21:47:19.788931403 +0200
+++ linux-4.9.5-psd-fix/include/linux/netfilter_ipv4/ipt_psd.h	2017-01-20 21:58:09.995871253 +0200
+@@ -21,14 +21,14 @@
+ #define SCAN_DELAY_THRESHOLD		(300) /* old usage of HZ here was erroneously and broke under uml */
+ 
+ /*
+- * Keep track of up to LIST_SIZE source addresses, using a hash table of
+- * HASH_SIZE entries for faster lookups, but limiting hash collisions to
+- * HASH_MAX source addresses per the same hash value.
+ * Keep track of up to PSD_LIST_SIZE source addresses, using a hash table of
+ * PSD_HASH_SIZE entries for faster lookups, but limiting hash collisions to
+ * PSD_HASH_MAX source addresses per the same hash value.
+  */
+-#define LIST_SIZE			0x100
+-#define HASH_LOG			9
+-#define HASH_SIZE			(1 << HASH_LOG)
+-#define HASH_MAX			0x10
+#define PSD_LIST_SIZE			0x100
+#define PSD_HASH_LOG			9
+#define PSD_HASH_SIZE			(1 << PSD_HASH_LOG)
+#define PSD_HASH_MAX			0x10
+ 
+ struct ipt_psd_info {
+ 	unsigned int weight_threshold;
+diff -Nurp linux-4.9.5-psd/net/ipv4/netfilter/ipt_psd.c linux-4.9.5-psd-fix/net/ipv4/netfilter/ipt_psd.c
+--- linux-4.9.5-psd/net/ipv4/netfilter/ipt_psd.c	2017-01-20 21:47:19.792931402 +0200
+++ linux-4.9.5-psd-fix/net/ipv4/netfilter/ipt_psd.c	2017-01-20 21:58:09.998871253 +0200
+@@ -74,8 +74,8 @@ struct host {
+  */
+ static struct {
+ 	spinlock_t lock;
+-	struct host list[LIST_SIZE];	/* List of source addresses */
+-	struct host *hash[HASH_SIZE];	/* Hash: pointers into the list */
+	struct host list[PSD_LIST_SIZE];	/* List of source addresses */
+	struct host *hash[PSD_HASH_SIZE];	/* Hash: pointers into the list */
+ 	int index;			/* Oldest entry to be replaced */
+ } state;
+ 
+@@ -91,9 +91,9 @@ static inline int hashfunc(struct in_add
+ 	hash = 0;
+ 	do {
+ 		hash ^= value;
+-	} while ((value >>= HASH_LOG));
+	} while ((value >>= PSD_HASH_LOG));
+ 
+-	return hash & (HASH_SIZE - 1);
+	return hash & (PSD_HASH_SIZE - 1);
+ }
+ 
+ static bool
+@@ -245,11 +245,11 @@ ipt_psd_match(const struct sk_buff *pskb
+ 	/* Got too many source addresses with the same hash value? Then remove the
+ 	 * oldest one from the hash table, so that they can't take too much of our
+ 	 * CPU time even with carefully chosen spoofed IP addresses. */
+-	if (count >= HASH_MAX && last) last->next = NULL;
+	if (count >= PSD_HASH_MAX && last) last->next = NULL;
+ 
+ 	/* We're going to re-use the oldest list entry, so remove it from the hash
+ 	 * table first (if it is really already in use, and isn't removed from the
+-	 * hash table already because of the HASH_MAX check above). */
+	 * hash table already because of the PSD_HASH_MAX check above). */
+ 
+ 	/* First, find it */
+ 	if (state.list[state.index].src_addr.s_addr)
+@@ -273,7 +273,7 @@ ipt_psd_match(const struct sk_buff *pskb
+ 
+ 	/* Get our list entry */
+ 	curr = &state.list[state.index++];
+-	if (state.index >= LIST_SIZE) state.index = 0;
+	if (state.index >= PSD_LIST_SIZE) state.index = 0;
+ 
+ 	/* Link it into the hash table */
+ 	head = &state.hash[hash];
@@ -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
@@ -0,0 +1,29 @@
+
+From: Gavin Li <git@thegavinli.com>
+
+brcmf_sdio_fromevntchan() was being called on the the data frame
+rather than the software header, causing some frames to be
+mischaracterized as on the event channel rather than the data channel.
+
+This fixes a major performance regression (due to dropped packets).
+
+Fixes: c56caa9db8ab ("brcmfmac: screening firmware event packet")
+Signed-off-by: Gavin Li <git@thegavinli.com>
+Cc: <stable@vger.kernel.org> [4.7+]
+---
+ drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+index dfb0658713d9..d2219885071f 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+@@ -1661,7 +1661,7 @@ static u8 brcmf_sdio_rxglom(struct brcmf_sdio *bus, u8 rxseq)
+ 					   pfirst->len, pfirst->next,
+ 					   pfirst->prev);
+ 			skb_unlink(pfirst, &bus->glom);
+-			if (brcmf_sdio_fromevntchan(pfirst->data))
+			if (brcmf_sdio_fromevntchan(&dptr[SDPCM_HWHDR_LEN]))
+ 				brcmf_rx_event(bus->sdiodev->dev, pfirst);
+ 			else
+ 				brcmf_rx_frame(bus->sdiodev->dev, pfirst,
@@ -0,0 +1,37 @@
+From 22b68b93ae2506bd56ee3bf232a51bc8ab955b56 Mon Sep 17 00:00:00 2001
+From: Larry Finger <Larry.Finger@lwfinger.net>
+Date: Mon, 19 Dec 2016 20:38:12 -0600
+Subject: [PATCH] rtlwifi: Fix kernel oops introduced with commit e49656147359
+
+With commit e49656147359 {"rtlwifi: Use dev_kfree_skb_irq instead of
+kfree_skb"), the method used to free an skb was changed because the
+kfree_skb() was inside a spinlock. What was forgotten is that kfree_skb()
+guards against a NULL value for the argument. Routine dev_kfree_skb_irq()
+does not, and a test is needed to prevent kernel panics.
+
+Fixes: e49656147359 ("rtlwifi: Use dev_kfree_skb_irq instead of kfree_skb")
+Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
+Cc: Stable <stable@vger.kernel.org> # 4.9+
+Cc: Wei Yongjun <weiyongjun1@huawei.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+---
+ drivers/net/wireless/realtek/rtlwifi/core.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c
+index 2caa4ad..ded1493 100644
+--- a/drivers/net/wireless/realtek/rtlwifi/core.c
+++ b/drivers/net/wireless/realtek/rtlwifi/core.c
+@@ -1829,7 +1829,8 @@ bool rtl_cmd_send_packet(struct ieee80211_hw *hw, struct sk_buff *skb)
+ 
+ 	spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
+ 	pskb = __skb_dequeue(&ring->queue);
+-	dev_kfree_skb_irq(pskb);
+	if (pskb)
+		dev_kfree_skb_irq(pskb);
+ 
+ 	/*this is wrong, fill_tx_cmddesc needs update*/
+ 	pdesc = &ring->desc[0];
+-- 
+2.10.2
+
@@ -0,0 +1,34 @@
+From e49656147359411fb7529a211e852e587e5970dd Mon Sep 17 00:00:00 2001
+From: Wei Yongjun <weiyongjun1@huawei.com>
+Date: Tue, 1 Nov 2016 14:48:40 +0000
+Subject: [PATCH] rtlwifi: Use dev_kfree_skb_irq instead of kfree_skb
+
+It is not allowed to call kfree_skb() from hardware interrupt
+context or with interrupts being disabled, spin_lock_irqsave()
+make sure always in irq disable context. So the kfree_skb()
+should be replaced with dev_kfree_skb_irq().
+
+This is detected by Coccinelle semantic patch.
+
+Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+---
+ drivers/net/wireless/realtek/rtlwifi/core.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c
+index f95760c..a11e8f5 100644
+--- a/drivers/net/wireless/realtek/rtlwifi/core.c
+++ b/drivers/net/wireless/realtek/rtlwifi/core.c
+@@ -1832,7 +1832,7 @@ bool rtl_cmd_send_packet(struct ieee80211_hw *hw, struct sk_buff *skb)
+ 
+ 	spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
+ 	pskb = __skb_dequeue(&ring->queue);
+-	kfree_skb(pskb);
+	dev_kfree_skb_irq(pskb);
+ 
+ 	/*this is wrong, fill_tx_cmddesc needs update*/
+ 	pdesc = &ring->desc[0];
+-- 
+2.10.2
+
@@ -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)
-
@@ -1419,12 +1419,12 @@ diff -Nurp linux-3.14.2/drivers/platform/x86/shuttle-wmi.c linux-3.14.2-shuttle/
 +
 +module_init(shuttle_wmi_init);
 +module_exit(shuttle_wmi_exit);
-diff -Nurp linux-3.14.2/MAINTAINERS linux-3.14.2-shuttle/MAINTAINERS
--- linux-3.14.2/MAINTAINERS	2014-03-31 06:40:15.000000000 +0300
-+++ linux-3.14.2-shuttle/MAINTAINERS	2014-04-26 18:33:26.869761100 +0300
-@@ -7880,6 +7880,12 @@ S:	Odd Fixes
+diff -Nurp linux-4.6/MAINTAINERS linux-4.6-shuttle/MAINTAINERS
+--- linux-4.6/MAINTAINERS
+++ linux-4.6-shuttle/MAINTAINERS
+@@ -10130,6 +10130,12 @@ S:	Orphan
 F:	drivers/media/platform/sh_vou.c
- F:	include/media/sh_vou.h
+ F:	include/media/drv-intf/sh_vou.h
 
 +SHUTTLE WMI EXTRAS DRIVER
 +M:	Herton Ronaldo Krzesinski <herton@mandriva.com.br>
@@ -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;
--- a/Show More
+++ b/Show More