Brian Behlendorf
|
85644501e7
|
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
|
2010-06-16 12:20:10 -07:00 |
|
Brian Behlendorf
|
80ad9bd985
|
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
|
2010-06-16 12:20:07 -07:00 |
|
Brian Behlendorf
|
485770416d
|
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
|
2010-06-16 12:19:34 -07:00 |
|
Brian Behlendorf
|
b0d8f99a8f
|
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
|
2010-06-16 12:19:31 -07:00 |
|
Brian Behlendorf
|
ae0f3b8989
|
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
|
2010-06-16 12:19:00 -07:00 |
|
Brian Behlendorf
|
4149705c8c
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2010-06-16 12:18:57 -07:00 |
|
Brian Behlendorf
|
d303d824d6
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2010-06-16 12:18:56 -07:00 |
|
Brian Behlendorf
|
a815be5aab
|
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
|
2010-06-16 12:17:54 -07:00 |
|
Brian Behlendorf
|
64b81f7c25
|
Merge commit 'refs/top-bases/linux-events' into linux-events
|
2010-06-16 12:17:51 -07:00 |
|
Brian Behlendorf
|
4d38cc5591
|
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
|
2010-06-16 12:17:21 -07:00 |
|
Brian Behlendorf
|
7354ad589b
|
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
|
2010-06-16 12:17:18 -07:00 |
|
Brian Behlendorf
|
c4733f00e7
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2010-06-16 12:16:49 -07:00 |
|
Brian Behlendorf
|
cee63ba34e
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2010-06-16 12:16:46 -07:00 |
|
Brian Behlendorf
|
2d9b27ae2b
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2010-06-16 12:16:16 -07:00 |
|
Brian Behlendorf
|
2acd3f767a
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2010-06-16 12:16:14 -07:00 |
|
Brian Behlendorf
|
133e794ecd
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2010-06-16 12:15:44 -07:00 |
|
Brian Behlendorf
|
77a8c4af80
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2010-06-16 12:15:42 -07:00 |
|
Brian Behlendorf
|
7e04b9387d
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2010-06-16 12:15:12 -07:00 |
|
Brian Behlendorf
|
b750997d65
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2010-06-16 12:15:10 -07:00 |
|
Brian Behlendorf
|
51b5252ea5
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2010-06-16 12:14:40 -07:00 |
|
Brian Behlendorf
|
87af8ae76b
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2010-06-16 12:14:37 -07:00 |
|
Brian Behlendorf
|
67f77396bf
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2010-06-16 12:14:08 -07:00 |
|
Brian Behlendorf
|
999ab921b0
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2010-06-16 12:14:05 -07:00 |
|
Brian Behlendorf
|
1651f6055b
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2010-06-16 12:13:35 -07:00 |
|
Brian Behlendorf
|
d700bedf10
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2010-06-16 12:13:32 -07:00 |
|
Brian Behlendorf
|
c53989400c
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2010-06-16 12:13:02 -07:00 |
|
Brian Behlendorf
|
ed15c80b39
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2010-06-16 12:13:00 -07:00 |
|
Brian Behlendorf
|
df055831d7
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2010-06-16 12:12:30 -07:00 |
|
Brian Behlendorf
|
70b7065e93
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2010-06-16 12:12:28 -07:00 |
|
Brian Behlendorf
|
c8a717f0af
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2010-06-16 12:11:58 -07:00 |
|
Brian Behlendorf
|
0de95c796f
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2010-06-16 12:11:55 -07:00 |
|
Brian Behlendorf
|
b8ece25717
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2010-06-16 12:11:25 -07:00 |
|
Brian Behlendorf
|
4562283ec8
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2010-06-16 12:11:23 -07:00 |
|
Brian Behlendorf
|
9fd12ce4fd
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2010-06-16 12:11:21 -07:00 |
|
Brian Behlendorf
|
2b71569742
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2010-06-16 12:11:20 -07:00 |
|
Brian Behlendorf
|
f00293115a
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2010-06-16 12:11:19 -07:00 |
|
Brian Behlendorf
|
877a37d8bd
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2010-06-16 12:11:18 -07:00 |
|
Brian Behlendorf
|
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 |
|
Brian Behlendorf
|
7e64440d7f
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2010-06-16 10:39:02 -07:00 |
|
Brian Behlendorf
|
f57c0267cf
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2010-06-16 10:39:00 -07:00 |
|
Brian Behlendorf
|
916ff9bb97
|
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
|
2010-06-16 10:38:58 -07:00 |
|
Brian Behlendorf
|
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 |
|
Brian Behlendorf
|
321a2639cd
|
Refresh autogen products
|
2010-06-16 10:09:02 -07:00 |
|
Brian Behlendorf
|
148053b660
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2010-06-16 10:04:05 -07:00 |
|
Brian Behlendorf
|
a1f8349461
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2010-06-16 10:01:08 -07:00 |
|
Brian Behlendorf
|
3fe3e41259
|
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
|
2010-06-16 10:01:06 -07:00 |
|
Brian Behlendorf
|
991e3fc98f
|
New TopGit dependency: linux-spa-thread
|
2010-06-16 10:00:02 -07:00 |
|
Brian Behlendorf
|
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 |
|
Brian Behlendorf
|
31acf50cd2
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2010-06-16 09:57:11 -07:00 |
|
Brian Behlendorf
|
2cda60c980
|
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
|
2010-06-16 09:57:10 -07:00 |