b0d8f99a8f
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-06-16 12:19:31 -07:00
ae0f3b8989
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-06-16 12:19:00 -07:00
4149705c8c
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-16 12:18:57 -07:00
d303d824d6
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-16 12:18:56 -07:00
a815be5aab
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-16 12:17:54 -07:00
64b81f7c25
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-16 12:17:51 -07:00
4d38cc5591
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-06-16 12:17:21 -07:00
7354ad589b
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-16 12:17:18 -07:00
c4733f00e7
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-06-16 12:16:49 -07:00
cee63ba34e
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-06-16 12:16:46 -07:00
2d9b27ae2b
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-06-16 12:16:16 -07:00
2acd3f767a
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-06-16 12:16:14 -07:00
133e794ecd
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-06-16 12:15:44 -07:00
77a8c4af80
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-06-16 12:15:42 -07:00
7e04b9387d
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-06-16 12:15:12 -07:00
b750997d65
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-06-16 12:15:10 -07:00
51b5252ea5
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-06-16 12:14:40 -07:00
87af8ae76b
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-16 12:14:37 -07:00
67f77396bf
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-06-16 12:14:08 -07:00
999ab921b0
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-06-16 12:14:05 -07:00
1651f6055b
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-06-16 12:13:35 -07:00
d700bedf10
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-06-16 12:13:32 -07:00
c53989400c
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-06-16 12:13:02 -07:00
ed15c80b39
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-16 12:13:00 -07:00
df055831d7
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-06-16 12:12:30 -07:00
70b7065e93
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-16 12:12:28 -07:00
c8a717f0af
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-06-16 12:11:58 -07:00
0de95c796f
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-16 12:11:55 -07:00
b8ece25717
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-16 12:11:25 -07:00
4562283ec8
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-06-16 12:11:23 -07:00
9fd12ce4fd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-16 12:11:21 -07:00
2b71569742
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-06-16 12:11:20 -07:00
f00293115a
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-06-16 12:11:19 -07:00
877a37d8bd
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-06-16 12:11:18 -07:00
8a001d8f59
Extra uninit vars flagged by gcc 4.1.2
...
Newer versions of the compiler are OK with this but for the sake of
older compilers explicitly initialize them.
2010-06-16 11:45:07 -07:00
916ff9bb97
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-16 10:38:58 -07:00
79577be589
Ensure sys/fm/util.h ia not included
...
Because of events related changes and the need to access zio_cmd_t
we can't unconditionally include sys/fm/util.h as part of zfs_context.h.
2010-06-16 10:34:40 -07:00
3fe3e41259
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-06-16 10:01:06 -07:00
6104e13be6
Add linux-spa-thread topic branch
...
Disable the spa thread under Linux until it can be implemented.
2010-06-16 09:59:39 -07:00
2cda60c980
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-06-16 09:57:10 -07:00
8c7748d8e0
Add linux-topology topic branch
...
Solaris recently introduced the idea of drive topology because
where a drive is located does matter. I have already handled
this with udev/blkid integration under Linux so I'm hopeful
this case can simply be removed but for now I've just stubbed
out what is needed in libspl and commented out the rest here.
2010-06-16 09:55:34 -07:00
6fa858c778
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-06-16 09:49:06 -07:00
14d073e298
Add linux-sha2 topic branch for portability
...
The upstream ZFS code has correctly moved to a faster native sha2
implementation. Unfortunately, under Linux that's going to be a little
problematic so we revert the code to the more portable version contained
in earlier ZFS releases. Using the native sha2 implementation in Linux
is possible but the API is slightly different in kernel version user
space depending on which libraries are used. Ideally, we need a fast
implementation of SHA256 which builds as part of ZFS this shouldn't be
that hard to do but it will take some effort.
2010-06-16 09:47:25 -07:00
1b1f5d19e4
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-06-14 17:00:53 -07:00
70bc736b0c
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-06-14 17:00:51 -07:00
c1fb84eeb2
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-06-14 17:00:45 -07:00
e8e324e048
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-14 17:00:43 -07:00
5de3a200c4
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-14 17:00:42 -07:00
d2412c0804
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-14 17:00:32 -07:00
55b02e4ca6
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-14 17:00:29 -07:00
Brian Behlendorf