Merge branch 'master' into patch-2

packages/common-git/spl-utils-common-git

@@ -1 +1 @@
-Subproject commit 4159cf4ed331e1b7e2b5338ce4478f18bda98232
+Subproject commit b1c773a5012366cba017df2c9a89e1e14f05f605

packages/common-git/zfs-utils-common-git

@@ -1 +1 @@
-Subproject commit cc8fbbd21f057dbbc485fc366fa3075ba071bdc5
+Subproject commit 13bf9fb4f68ae2b413639fc512e370c4af93cc8b

packages/linux-hardened/spl-linux-hardened

@@ -1 +1 @@
-Subproject commit 855883c502d51c2938c139463f2e3ec9d6a5069f
+Subproject commit c8f8c3ffcdb628517401c241cbe1cac9cdd8f15a

packages/linux-hardened/spl-linux-hardened-git

@@ -1 +1 @@
-Subproject commit 8eeb93f0ddcc11a847dbb39609309b87b4a7b7c8
+Subproject commit 9141ee549bbcb5bdb21ab9e2c0427babba5caab0

packages/linux-hardened/zfs-linux-hardened

@@ -1 +1 @@
-Subproject commit 7aecc5a0749bf0ef5ab4cdfea10173a2d86dc991
+Subproject commit 0627bee90b16031ae9a1381a01267f8f560c6b55

packages/linux-hardened/zfs-linux-hardened-git

@@ -1 +1 @@
-Subproject commit 671d0ae8830acb23a6786637e0a282f2efa14095
+Subproject commit 943a0a4ca28c3fbe70c33fd203d229c530b9c716

packages/linux-lts/spl-linux-lts

@@ -1 +1 @@
-Subproject commit 55f9019e9c5a9acfb6151b48da0414f7c2d1091e
+Subproject commit 20a77994df08a5f0f26ee3a10b230e10a1a787eb

packages/linux-lts/spl-linux-lts-git

@@ -1 +1 @@
-Subproject commit 2a5592d2f5f36ca52c280fd25660bb13cd63f9c1
+Subproject commit 5f72b87817506d88aaa06247c3d57f38a130c777

packages/linux-lts/zfs-linux-lts

@@ -1 +1 @@
-Subproject commit 89c26ce88183366368c312a39ec98704060a6978
+Subproject commit ba94752c5a11e7ad60e2b01885d31e36337bfb36

packages/linux-lts/zfs-linux-lts-git

@@ -1 +1 @@
-Subproject commit 538b5871fda7cc47459177ce3cc19e10e6767d68
+Subproject commit 94eda889923f99ed0da46a419b25b460f93f9b7b

src/kernels/common-git.sh

@@ -3,7 +3,7 @@ mode_name="common-git"
 mode_desc="Select and use the packages that are common between all kernels (git version)"
 
 # Version for GIT packages
-pkgrel_git="2"
+pkgrel_git="3"
 zfs_git_commit=""
 spl_git_commit=""
 zfs_git_url="https://github.com/zfsonlinux/zfs.git"

src/kernels/linux-hardened.sh

@@ -3,8 +3,8 @@ mode_name="hardened"
 mode_desc="Select and use the packages for the linux-hardened kernel"
 
 # Kernel versions for hardened packages
-pkgrel="2"
-kernel_version="4.12.8.b-1"
+pkgrel="1"
+kernel_version="4.12.9.a-1"
 
 # Kernel version for GIT packages
 pkgrel_git="${pkgrel}"

src/kernels/linux-lts.sh

@@ -3,8 +3,8 @@ mode_name="lts"
 mode_desc="Select and use the packages for the linux-lts kernel"
 
 # Kernel versions for LTS packages
-pkgrel="2"
-kernel_version="4.9.44-1"
+pkgrel="1"
+kernel_version="4.9.45-1"
 
 # Kernel version for GIT packages
 pkgrel_git="${pkgrel}"

src/zfs-utils/zfs-utils.initcpio.hook

@@ -27,19 +27,19 @@ zfs_get_bootfs () {
 
 zfs_decrypt_fs() {
     dataset=$1
-    
+
     # check if 'zfs load-key' is available
     zfs 2>&1 | grep load-key > /dev/null || return 0
-    
+
     # check if dataset is encrypted
     [ "$(zfs get -H -o value encryption "${dataset}")" != "off" ] || return 0
-    
+
     # check if key is already loaded
     [ "$(zfs get -H -o value keystatus "${dataset}")" != "available" ] || return 0
     
     # get the encryption root
     encryptionroot=$(zfs get -H -o value encryptionroot "${dataset}")
-    
+
     # loop until we get the correct password
     while ! eval zfs load-key "${encryptionroot}"; do
         sleep 2
@@ -90,7 +90,6 @@ zfs_mount_handler () {
                     if findmnt -snero source -F "${tab_file}" -S "${dataset}" > /dev/null 2>&1; then
                         opt=$(findmnt -snero options -F "${tab_file}" -S "${dataset}")
                         mnt=$(findmnt -snero target -F "${tab_file}" -S "${dataset}")
-                        
                         zfs_decrypt_fs "${dataset}"
                         mount -t zfs -o "${opt}" "${dataset}" "${node}${mnt}"
                     fi