c/zfsonlinux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix cherry-picking relevant 0.6.5.4 changes

Browse Source 
When cherry-picking range A..B the commit A won't get cherry picked,
only the commits after A.
To fix that use range A^..B as ^ selects the previous commit.

This fixes the build of zfs with linux kernel version 4.4 as one
compatibility change commit wasn't included.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2016-02-04 10:57:40 +01:00 committed by Dietmar Maurer
parent 8d62a89482
commit d064c14aad
3 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -75,7 +75,7 @@ download:
# 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
cd pkg-zfs; git cherry-pick e909a45d22be9645f8bca27bfc4db6912648e1be^..1ffc4c150e10310b319ab8a7d83f1f98f9a1e651
tar czf ${SPLSRC} pkg-spl
tar czf ${ZFSSRC} pkg-zfs

BIN
pkg-spl.tar.gz
View File

Binary file not shown.

BIN
pkg-zfs.tar.gz
View File

Binary file not shown.