Update to zfs/spl 0.6.5.6

diff --git a/Makefile b/Makefile
index f0c7b247143fc1bdb26807c1b835780f3b9f091f..5d4d2406e02867eace2e2df4d7ff50433e6eb6ed 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -63,19 +63,21 @@ download:
        rm -rf pkg-spl pkg-zfs ${SPLSRC} ${ZFSSRC}
        git clone https://github.com/zfsonlinux/pkg-spl.git
        # list tags with:  git tag --list 'master/*'
-       cd pkg-spl; git checkout spl-0.6.5-release
-       cd pkg-spl; git pull --no-edit git://github.com/zfsonlinux/spl.git spl-0.6.5-release
+       cd pkg-spl; git fetch https://github.com/zfsonlinux/spl.git spl-0.6.5-release
        cd pkg-spl; git checkout master/debian/jessie/0.6.5-1
-       # manual merge spl-0.6.5.4
-       cd pkg-spl; git merge --no-edit spl-0.6.5-release
+       # manual merge spl-0.6.5.6
+       cd pkg-spl; git merge --no-edit spl-0.6.5.6
        git clone https://github.com/zfsonlinux/pkg-zfs.git
-       cd pkg-zfs; git checkout -b zfs-0.6.5.4
-       cd pkg-zfs; git pull --no-edit git://github.com/zfsonlinux/zfs.git zfs-0.6.5-release
+       cd pkg-zfs; git fetch https://github.com/zfsonlinux/zfs.git zfs-0.6.5-release
        cd pkg-zfs; git checkout master/debian/jessie/0.6.5.2-2
        # manual cherry-pick relevant 0.6.5.3 updates
        cd pkg-zfs; git cherry-pick cd887ab869bb506c88a66ba8c225ca42680b89d f9f5394f74f7bf421eb484e8d1653257d92f5ace 9aaf60b66d10cb01c3c1fc67fa094b17a83b002a
        # manual cherry-pick relevant 0.6.5.4 updates
        cd pkg-zfs; git cherry-pick e909a45d22be9645f8bca27bfc4db6912648e1be^..1ffc4c150e10310b319ab8a7d83f1f98f9a1e651
+       # manual cherry-pick relevant 0.6.5.5 updates
+       cd pkg-zfs; git cherry-pick a5dae61721fac617d37ac8585a9ed5fe5aa20d1d^..504ff597092ec6160675685db938dbd21043b690
+       # manual cherry-pick relevant 0.6.5.6 updates
+       cd pkg-zfs; git cherry-pick 63ce7b6fcfc417fc58cbfaca641d54d66eeaccab^..21f21fe85989004e60d316fca9bb4eb4cde10eb7
        tar czf ${SPLSRC} pkg-spl
        tar czf ${ZFSSRC} pkg-zfs