a5a71d128d
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/spa.c
2009-07-02 16:52:07 -07:00
5a2a5d64a5
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-07-02 16:51:09 -07:00
b095bf444a
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
...
Conflicts:
cmd/zfs/zfs_main.c
lib/libzfs/libzfs_dataset.c
2009-07-02 16:50:53 -07:00
e2b2597751
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
cmd/zdb/zdb_il.c
cmd/zfs/zfs_main.c
cmd/zinject/zinject.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_graph.c
module/zcommon/include/sys/fm/fs/zfs.h
module/zcommon/include/zfs_deleg.h
module/zcommon/include/zfs_namecheck.h
module/zcommon/zfs_deleg.c
module/zcommon/zfs_namecheck.c
module/zcommon/zprop_common.c
module/zfs/arc.c
module/zfs/dmu.c
module/zfs/dmu_object.c
module/zfs/dmu_objset.c
module/zfs/dsl_pool.c
module/zfs/dsl_prop.c
module/zfs/fletcher.c
module/zfs/include/sys/dsl_deleg.h
module/zfs/include/sys/dsl_prop.h
module/zfs/include/sys/metaslab_impl.h
module/zfs/include/sys/spa_boot.h
module/zfs/include/sys/zap.h
module/zfs/include/sys/zap_impl.h
module/zfs/include/sys/zfs_context.h
module/zfs/include/sys/zfs_ctldir.h
module/zfs/include/sys/zfs_dir.h
module/zfs/include/sys/zfs_fuid.h
module/zfs/include/sys/zfs_ioctl.h
module/zfs/spa.c
module/zfs/spa_errlog.c
module/zfs/spa_history.c
module/zfs/zap.c
module/zfs/zap_leaf.c
module/zfs/zap_micro.c
module/zfs/zfs_ioctl.c
module/zfs/zio.c
2009-07-02 16:49:11 -07:00
e9f14862a5
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
module/zfs/dmu_objset.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/vdev_label.c
module/zfs/zio.c
2009-07-02 16:18:03 -07:00
9babb37438
Rebase master to b117
2009-07-02 15:44:48 -07:00
e3d5b2a900
Refresh autogen products
2009-07-01 11:37:26 -07:00
80cfd98d8e
Refresh autogen products
2009-06-09 16:46:26 -07:00
26f70525ee
Refresh autogen products
2009-06-08 16:33:33 -07:00
3dc39b4640
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-05-22 16:38:53 -07:00
9f4fdec42d
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-05-22 16:38:49 -07:00
2a744e0bbb
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-05-22 16:38:43 -07:00
2384f8a72f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-05-22 16:38:21 -07:00
4e048c65aa
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-05-22 16:38:14 -07:00
40e75795ca
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-05-22 16:37:19 -07:00
4a2266c1d5
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-05-22 16:36:53 -07:00
300575508d
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-05-22 16:36:45 -07:00
5451ee79e5
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-05-22 16:36:26 -07:00
e1d6e67473
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-05-22 16:36:23 -07:00
9c53917bd5
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-05-22 16:36:23 -07:00
e56aa929e8
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-05-22 16:36:22 -07:00
8e9605062a
Explictly use signed char for portability. On x86/x86_64
...
systems the default char type is signed, on ppc/ppc64 systems
the default char type is unsigned.
2009-05-22 16:30:47 -07:00
cfd4735d0b
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-20 09:34:01 -07:00
17a6ec3550
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-20 09:33:52 -07:00
d24362e80b
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-20 09:33:38 -07:00
fa58082158
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-20 09:33:01 -07:00
0826ebc008
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-20 09:32:50 -07:00
dddcb5433e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-20 09:31:02 -07:00
dd585763ef
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-20 09:30:16 -07:00
daab277117
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-20 09:30:03 -07:00
1b2503a433
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-20 09:29:26 -07:00
f53e5a851d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-20 09:29:22 -07:00
0c88bc3ccd
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-03-20 09:29:21 -07:00
13814fe220
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-03-20 09:29:16 -07:00
99da5f93e8
Fix uninitialized variable error in ztest_dmu_commit_callbacks()
2009-03-20 09:20:49 -07:00
2099e8d984
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-19 21:32:42 -07:00
69d994bbe9
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-19 21:32:36 -07:00
f764039e87
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-19 21:32:26 -07:00
aee87a5ab6
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-19 21:31:54 -07:00
6756c613c1
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-19 21:31:38 -07:00
61914d7403
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-19 21:30:15 -07:00
ea8c53f9e1
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-19 21:29:37 -07:00
1b88587905
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-19 21:29:26 -07:00
56d18263ed
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-19 21:28:54 -07:00
bd1685ee4e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 21:28:51 -07:00
1769e10f17
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-03-19 21:28:50 -07:00
63781842e3
Update mutex_lock to pthread_mutex_lock for zcl->zcl_callback_locks.
2009-03-19 21:21:35 -07:00
51b59652a3
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-19 21:13:28 -07:00
9ab7adb553
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-19 21:13:22 -07:00
4f2dfa3c94
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-19 21:13:11 -07:00
665c272091
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-19 21:11:35 -07:00
a676a29d25
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-19 21:11:25 -07:00
275f4aae5d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
...
Conflicts:
module/zfs/dmu_tx.c
2009-03-19 21:08:17 -07:00
0bdc8e0aec
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-19 21:06:46 -07:00
376a68e404
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-19 21:06:35 -07:00
7f33364d3c
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzpool/include/sys/zfs_context.h
module/zfs/dmu_tx.c
module/zfs/txg.c
2009-03-19 21:03:58 -07:00
e7f02d3b41
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 20:59:33 -07:00
eb811f7fa9
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/txg.h
2009-03-19 20:59:12 -07:00
54b5b41a58
Add 'feature-pthreads' branch to features branch.
2009-03-19 20:49:52 -07:00
29703a5b4e
Add 'feature-commit-cb' branch for DMU commit callbacks.
2009-03-19 20:30:14 -07:00
61cd467f6d
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-19 19:58:45 -07:00
82c7af8987
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-19 19:58:40 -07:00
7a87dfebb8
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-19 19:58:30 -07:00
d9fd92c850
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-19 19:57:26 -07:00
240445807b
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-19 19:57:13 -07:00
dabea57f25
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-19 19:55:49 -07:00
bd2293fdb1
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-19 19:55:03 -07:00
1d2e8df03f
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-19 19:54:53 -07:00
5e5d31f105
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzpool/include/sys/zfs_context.h
2009-03-19 19:52:21 -07:00
8c43ad3853
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 19:49:56 -07:00
8cdcf1ef44
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-19 19:49:55 -07:00
05cec154f5
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2009-03-19 19:49:53 -07:00
53db4c7b29
Revert fix-pthreads moving to feature-pthreads branch
2009-03-19 19:43:09 -07:00
04621618cf
Refresh autogen products
2009-03-18 15:05:35 -07:00
e61fa20d11
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-18 14:40:31 -07:00
f66b3676e1
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-18 14:40:20 -07:00
1eb357eeb1
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-18 14:40:02 -07:00
b46037b53f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-18 14:39:07 -07:00
c7cc10351e
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-18 14:38:48 -07:00
5b5d766544
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-18 14:34:25 -07:00
3f05b34895
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-18 14:33:06 -07:00
c0a760420e
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-18 14:32:47 -07:00
c6ddce0341
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-18 14:31:53 -07:00
70407622a7
Move `make check` ztest under ./scripts where the module stack is loaded.
2009-03-18 14:19:04 -07:00
a1c694bf03
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-18 13:03:43 -07:00
6ca96b06b4
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-18 13:03:00 -07:00
cc4fbf2c35
Revert to previous behavior zdb fails when unable to open /dev/zfs.
...
For the moment I have added an error message to the failure path to
make it clear what happened. I have also changed the zdb ASSERT to
a VERIFY so we always catch the failure. For now we will just always
ensure the module stack is loaded, longer term we need something a
little more flexible.
2009-03-18 12:48:54 -07:00
92df72acf1
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-16 11:24:15 -07:00
af0afd9ce3
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-03-16 11:24:10 -07:00
53edd221ff
Pull unused get_one_dataset() under HAVE_ZPL ifdef.
2009-03-16 11:14:19 -07:00
15ae49cfcc
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-16 10:43:42 -07:00
a4f629ec9d
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-16 10:43:34 -07:00
cddaf29902
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-16 10:43:19 -07:00
754431f4db
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-16 10:42:43 -07:00
10e245f03f
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
...
Conflicts:
cmd/zpool/zpool_main.c
2009-03-16 10:42:20 -07:00
e98228ab73
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-16 10:39:08 -07:00
dbbb5c2e4e
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-16 10:38:52 -07:00
c9cff73d9e
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/zpool/zpool_main.c
2009-03-16 10:32:12 -07:00
be112b3f57
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-16 10:30:31 -07:00
5ee8a85ba6
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-16 10:30:27 -07:00
9818e69640
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2009-03-16 10:12:01 -07:00
2924858552
Remove two self referential functions.
...
Newer versions of gcc (4.3.0) detected the following unused
code segments.
2009-03-16 10:02:06 -07:00
7fa1ced508
Refresh autogen products, remove stray zdump Makefile.in
2009-03-12 16:48:12 -07:00
0fe418c548
Refresh autogen products
2009-03-12 15:55:23 -07:00
b103899a39
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-12 15:54:18 -07:00
93643c487f
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-03-12 15:54:13 -07:00
c7979c6f55
Check realpath() return code.
2009-03-12 15:49:23 -07:00
6a1223268c
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-12 15:47:43 -07:00
71bc2e8c03
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-12 15:47:36 -07:00
59edc6fb4e
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-12 15:47:27 -07:00
2a21321766
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-12 15:46:56 -07:00
c399ce1af8
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-12 15:46:45 -07:00
9e4850e3d1
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-12 15:44:54 -07:00
65d5ab8f56
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-12 15:44:42 -07:00
5a7e7e9d3b
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 15:44:18 -07:00
82ce8b00f3
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 15:44:14 -07:00
6a5acaa105
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 15:44:13 -07:00
9fe5b916e2
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2009-03-12 15:39:27 -07:00
9e49df6b20
Add gcc-fortify-source branch
2009-03-12 15:38:51 -07:00
808e542240
Refresh autogen products
2009-03-12 11:06:21 -07:00
635e9ba8a0
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-12 10:41:10 -07:00
98e7b9f354
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-12 10:41:02 -07:00
bb06faa046
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-12 10:40:54 -07:00
58e63ca4cc
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-12 10:40:17 -07:00
fbbb5fe669
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-12 10:40:09 -07:00
45f3d2a2a4
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-12 10:38:05 -07:00
5f9ae91a8a
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-12 10:37:50 -07:00
9bdbd7c8f7
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 10:37:18 -07:00
b9b399bf04
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 10:37:14 -07:00
a03187bb3b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 10:37:12 -07:00
f8fe8a76f4
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-03-12 10:37:11 -07:00
cabd4a69c4
Resolve remaining uninitialized variables
...
Most of these fixes appear to be harmless and should never occur.
However, there were a few cases in this patch which do concern me,
I doubt we're seeing them but they look possible... mainly in the
user tools.
2009-03-12 10:30:41 -07:00
282a0b0995
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-12 10:03:50 -07:00
8da25a0948
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-12 10:03:39 -07:00
a59f378c54
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-12 10:03:31 -07:00
308903afa4
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-12 10:02:53 -07:00
77695eacc1
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-12 10:02:45 -07:00
dcc25c44da
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-12 10:00:48 -07:00
8e56c7350f
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-12 10:00:38 -07:00
0cdc14e427
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 10:00:07 -07:00
dd30dba016
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 10:00:04 -07:00
193ea156e9
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 10:00:03 -07:00
eceaf813ad
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-03-12 10:00:01 -07:00
f2d72af596
Add remaining missing cases (or a default) to all switch statements.
...
The previous code was not wrong, but this prevents gcc from warning
us about missing cases for these known safe switch statements. The
-Wno-missing-cases can now be removed to detect places where we
accidentally forgot a case.
2009-03-12 09:53:08 -07:00
9fb7b2f3bf
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-12 09:28:01 -07:00
396b45acc8
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-12 09:27:52 -07:00
4f216a686e
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-12 09:27:43 -07:00
b1687e86ec
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-12 09:27:13 -07:00
9bee4c8c52
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-12 09:27:04 -07:00
13742b3b80
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-12 09:25:14 -07:00
cb931a10ff
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-12 09:25:05 -07:00
308a05919a
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 09:24:35 -07:00
2e9568b6be
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 09:24:32 -07:00
fba88e48f2
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-12 09:24:31 -07:00
9de6723b83
ztest_resume should be ztest_resume_thread in pthread_create()
...
Fix an accidental bug introducted by the pthreads changes. When creating
a resume thread the handler function was accidentally changed from
ztest_resume to ztest_resume_thread. There's a decent chance this
may explain some/all of the crashes that have be observed running
ztest. This issue was exposed and easily fixed once the -Wno-unused
check was removed from the build system. Happily at least one real
bug fix resulted from that cleanup.
2009-03-12 09:13:40 -07:00
dd82a3b6bc
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 23:10:09 -07:00
da4d2eea9d
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-03-11 23:10:06 -07:00
73db9f622c
Pull unused err variable under HAVE_DM_INUSE_SWAP ifdef.
2009-03-11 23:05:42 -07:00
6f5aac6171
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 23:00:07 -07:00
06fd9e48a0
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-03-11 23:00:04 -07:00
8aac8753f4
Move 4 unused functions under HAVE_ZPL until implemented.
2009-03-11 22:55:45 -07:00
77a1188aee
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 22:50:42 -07:00
0d19b2613b
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-03-11 22:50:31 -07:00
1c0279a08f
Resolve newly revealed unused vars and symbols caused by topic branch.
2009-03-11 22:43:09 -07:00
0b5ddcfdca
Refresh autogen products
2009-03-11 22:31:29 -07:00
4acf3b07c0
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 22:30:41 -07:00
3a9f66d280
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-03-11 22:29:58 -07:00
071662bf32
Remove unused variable
2009-03-11 22:14:08 -07:00
378663e310
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 21:03:25 -07:00
1fcdd63cc6
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-11 21:03:21 -07:00
cb52b25a43
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-11 21:03:09 -07:00
9326966d34
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 21:02:37 -07:00
b392fd33fd
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-11 21:02:27 -07:00
9c4cc2ae78
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-11 21:00:25 -07:00
87094b528c
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-11 21:00:16 -07:00
c351352990
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-11 20:59:46 -07:00
4c042de40b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 20:59:43 -07:00
60ac8152fe
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 20:59:42 -07:00
9915249546
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2009-03-11 20:53:11 -07:00
d4dbc7dca8
Resolve all instances of missing braces.
2009-03-11 20:52:21 -07:00
8cb718a76c
Refresh autogen products
2009-03-11 14:25:09 -07:00
3f8174047a
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 14:13:57 -07:00
fa2e001fe3
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-11 14:13:47 -07:00
b2041bc8ef
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-11 14:13:33 -07:00
bd92e256e6
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 14:12:52 -07:00
330dbde81a
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-11 14:12:39 -07:00
cac68bc478
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-11 14:09:49 -07:00
0f0abc8d58
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-11 14:09:36 -07:00
5afc3db3ce
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-11 14:08:57 -07:00
1ca6578ebc
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 14:08:51 -07:00
8a3b1a5ff5
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 14:08:50 -07:00
e5011401cd
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-03-11 14:08:48 -07:00
3226eea157
Resolve additional cases where gcc wants extra parenthesis.
...
These were introduced by the rebase to b108.
2009-03-11 13:57:47 -07:00
b8dd7de0b5
Refresh autogen products
2009-03-11 13:30:38 -07:00
8927c974cf
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 11:22:46 -07:00
e77e7b4dc3
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-11 11:22:35 -07:00
af12291488
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
...
Conflicts:
module/zfs/rrwlock.c
module/zfs/zfs_replay.c
2009-03-11 11:22:11 -07:00
a55824aa6a
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 11:20:15 -07:00
261ca2beb9
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-11 11:19:58 -07:00
47e0037a8b
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-11 11:15:59 -07:00
bc22a004ee
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-11 11:15:40 -07:00
bf200630f9
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
module/zfs/rrwlock.c
module/zfs/spa_boot.c
module/zfs/zfs_replay.c
2009-03-11 11:12:24 -07:00
dff484a388
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 11:09:13 -07:00
5f30a3cb0e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 11:09:11 -07:00
8fe801fd8f
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-03-11 11:00:42 -07:00
af45030850
Added 'gcc-ident-pragmas' branch.
2009-03-11 10:59:45 -07:00
d8f08a37c1
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 10:45:09 -07:00
ab3f1d72e8
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-11 10:45:02 -07:00
2ff4ee3cae
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-11 10:44:51 -07:00
2d756b5ea3
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 10:44:10 -07:00
2be3b720b9
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-11 10:43:59 -07:00
e42874df99
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-11 10:41:25 -07:00
762bbd3368
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-11 10:41:10 -07:00
73c738d1ce
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-11 10:40:37 -07:00
8eaf19dae8
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 10:40:33 -07:00
d43e9ca262
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 10:40:31 -07:00
d641369d38
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-03-11 10:32:45 -07:00
fd9a7a0fb4
Add 'ull' suffix to 64-bit constants.
2009-03-11 10:31:24 -07:00
e1b736ecc8
Refresh autogen products
2009-03-10 11:42:01 -07:00
2c7ad95794
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-19 14:57:33 -08:00
29946892d9
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-19 14:57:29 -08:00
ddfa570f42
Initial update to support zpios.sh profiling option.
2009-02-19 14:51:40 -08:00
9c27e585f6
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-19 13:58:31 -08:00
023a02025f
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-19 13:58:27 -08:00
5ae73585fb
Cleanup zpios option handling
2009-02-19 13:53:17 -08:00
f951aec719
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-19 13:02:05 -08:00
d3f070026f
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-19 13:02:01 -08:00
23710f1308
Minor zpios cleanup plus addition of --nowait feature
2009-02-19 12:56:50 -08:00
b4028a1bf5
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-18 14:38:55 -08:00
3bef977501
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-02-18 14:38:45 -08:00
7b8eca908f
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
...
Conflicts:
cmd/zpool/zpool_main.c
2009-02-18 14:38:20 -08:00
b3d7657ea0
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-02-18 14:37:01 -08:00
437bc77985
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-02-18 14:36:49 -08:00
f78c15d84f
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-02-18 14:34:03 -08:00
7e21796d7e
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-02-18 14:33:48 -08:00
8090a9a908
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/zpool/zpool_main.c
2009-02-18 14:31:46 -08:00
7872d84be6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-02-18 14:30:54 -08:00
15f5ddebdf
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
...
Conflicts:
lib/libzpool/kernel.c
2009-02-18 14:29:08 -08:00
f0a8aedfbc
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
...
Conflicts:
lib/libzpool/kernel.c
module/zfs/arc.c
2009-02-18 14:27:12 -08:00
fc8954db24
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-02-18 13:12:48 -08:00
e203e7b48f
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-02-18 13:12:35 -08:00
f686a87058
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/arc.c
2009-02-18 13:12:26 -08:00
3b17164f71
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
module/zfs/vdev.c
module/zfs/zio.c
2009-02-18 13:09:32 -08:00
d164b20935
Rebase master to b108
2009-02-18 12:51:31 -08:00
2b9aadcaf2
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-13 12:19:30 -08:00
6cb1ac2d49
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-13 12:19:24 -08:00
68346c54fe
Misnamed --load option sff changed to ssf
2009-02-13 12:07:34 -08:00
b4a92368d2
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-15 15:56:36 -08:00
4f715bee61
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-01-15 15:56:30 -08:00
b53602e7c0
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-15 15:56:25 -08:00
4144f1ed75
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-15 15:56:09 -08:00
941807d6be
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-01-15 15:56:04 -08:00
f21c45793f
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-15 15:54:58 -08:00
8bc4bdbdc5
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-01-15 15:54:53 -08:00
20d418a96c
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-15 15:54:39 -08:00
85c77e1c82
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 15:54:35 -08:00
ee7f10a6b3
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-15 15:54:34 -08:00
cf9a5530e1
Fix pthreads prototype
2009-01-15 15:52:12 -08:00
db5acee33d
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-15 15:42:36 -08:00
48e92c8c9d
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-01-15 15:42:31 -08:00
49e805ee3e
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-15 15:42:26 -08:00
4662f38b69
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-15 15:42:10 -08:00
494d56c4dd
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-01-15 15:42:05 -08:00
08567d3be9
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-15 15:41:01 -08:00
c41eda4350
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-01-15 15:40:56 -08:00
de2098cc11
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-15 15:40:42 -08:00
0197f3a298
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 15:40:39 -08:00
975c613269
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-15 15:40:39 -08:00
51730cdeae
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-15 15:40:37 -08:00
37a3478d58
Resolve C90 int declared in for() construct
2009-01-15 15:38:26 -08:00
f863f8f848
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-15 14:22:27 -08:00
2a0e254804
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-01-15 14:22:20 -08:00
adcb983918
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-15 14:22:14 -08:00
de66052064
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-15 14:21:55 -08:00
df7ad715a9
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-01-15 14:21:49 -08:00
cb8e50168e
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-15 14:19:06 -08:00
fd0e369487
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-01-15 14:19:00 -08:00
1f372d9030
Resolve conflict with removed cleaner type
2009-01-15 14:18:01 -08:00
ddaad20220
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:16:23 -08:00
a42707fcc0
Resolve conflict with removed cleaner type
2009-01-15 14:16:03 -08:00
da7151a89e
Resolve conflict with removed cleaner type
2009-01-15 14:11:19 -08:00
86e39f5e3b
Resolve conflict with removed cleaner type
2009-01-15 14:05:21 -08:00
a2e601c6e3
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-01-15 14:04:39 -08:00
3fa768e21b
Resolve conflict with removed cleaner type
2009-01-15 14:04:35 -08:00
d3df6b2012
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-01-15 14:01:51 -08:00
fb5f0bc833
Rebase master to b105
2009-01-15 13:59:39 -08:00
87fc3feb38
Refresh autogen products
2009-01-14 16:09:39 -08:00
6d0121d8de
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-14 16:05:29 -08:00
0d8e925476
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-01-14 16:05:17 -08:00
37e2d99e39
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-14 16:05:09 -08:00
9339984f08
Resolve conflict
2009-01-14 16:04:33 -08:00
b00ebbc449
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-01-14 15:44:26 -08:00
8946662029
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-14 15:43:26 -08:00
fe23ec2be6
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-01-14 15:43:21 -08:00
9e40470aa0
Resolve conflict
2009-01-14 15:42:28 -08:00
9c22d76019
Minor 'make check' updates
2009-01-14 15:38:56 -08:00
b289cc1996
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-14 13:40:44 -08:00
24ee934b8b
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-01-14 13:39:05 -08:00
6db77d2fe2
Add linux-ztest branch
2009-01-14 13:38:07 -08:00
0817cfaa4b
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-14 08:42:39 -08:00
50832652c2
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-01-14 08:42:33 -08:00
1194e0412f
Change all instances of kpios to zpios
2009-01-14 08:38:35 -08:00
9855548496
Refresh autogen products
2009-01-09 11:35:52 -08:00
1f02aaba1c
Refresh autogen products
2009-01-05 12:47:00 -08:00
aaefbb4e76
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-05 12:45:45 -08:00
35cfc1bb85
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-05 12:45:38 -08:00
0e00972b2a
Resolve conflict
2009-01-05 12:42:30 -08:00
681ba5c296
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-01-05 12:41:42 -08:00
c8fa7c9b23
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-05 12:39:56 -08:00
ce248fc03d
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-01-05 12:39:45 -08:00
9a0cb95b1b
Resolve conflict
2009-01-05 12:38:23 -08:00
ce7115b807
Add unicode makefile references and support
2009-01-05 12:33:09 -08:00
257bb2a08d
Refresh autogen products
2009-01-05 11:24:12 -08:00
cb95f47aaf
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-05 11:23:17 -08:00
150630eccd
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-05 11:23:13 -08:00
fa7980f197
Remove zdump
2009-01-05 11:22:57 -08:00
3340446a73
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-01-05 11:22:25 -08:00
71102ea91e
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-05 11:21:28 -08:00
0b35a8c9c6
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-01-05 11:21:24 -08:00
e3b6de2c22
Remove zdump
2009-01-05 11:20:33 -08:00
6fd7b17036
Remove remaining zdump Makefile references
2009-01-05 11:18:06 -08:00
6a73d9f6b2
Remove zdump.c
2009-01-05 11:17:09 -08:00
ca7e851794
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-05 11:16:26 -08:00
3767655021
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-05 11:16:11 -08:00
045d42028a
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-01-05 11:16:07 -08:00
9eaf63425e
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-05 11:15:08 -08:00
95ce3565a9
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-01-05 11:15:03 -08:00
ef0ca51855
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-05 11:14:50 -08:00
88ddd54799
Remove zdump Makefiles
2009-01-05 11:12:44 -08:00
578a1db888
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-05 11:11:56 -08:00
e5547d3cbf
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
2009-01-05 11:11:47 -08:00
adc6253cbf
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-05 11:11:33 -08:00
d1410e11bc
Remove zdump.c
2009-01-05 11:11:21 -08:00
9fd00aa162
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-01-05 11:11:05 -08:00
148d093b76
Remove zdump.c
2009-01-05 11:11:02 -08:00
1ed474aa0d
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-01-05 11:10:31 -08:00
36b849fa51
Remove zdump, it's an unrelateds command which I added simply due to the z* command convention
2009-01-05 11:10:13 -08:00
9403f4a605
Refresh autogen products
2008-12-23 12:39:25 -08:00
d8c0d57440
Refresh autogen products
2008-12-23 10:41:37 -08:00
e9423a508e
Refresh autogen products
2008-12-23 09:45:24 -08:00
de48f4632d
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-23 09:44:54 -08:00
8888d3d650
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2008-12-23 09:44:52 -08:00
2475a871b0
Minimal include set
2008-12-23 09:42:55 -08:00
d727ee9e21
Refresh autogen products
2008-12-23 09:27:14 -08:00
56fbb79996
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-23 09:26:12 -08:00
4230c743cd
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2008-12-23 09:26:10 -08:00
fe119cee57
Minor zpios cleanup
2008-12-23 09:24:19 -08:00
a10bb0440c
Refresh autogen products
2008-12-22 16:59:25 -08:00
e53b49c61c
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 16:58:45 -08:00
bd2d7d641d
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2008-12-22 16:58:39 -08:00
fe23f773a7
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-22 16:58:20 -08:00
ee1ca98846
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-22 16:58:12 -08:00
489409adf2
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 16:56:33 -08:00
b8d37fd38d
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2008-12-22 16:56:25 -08:00
4bbb394a8a
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 16:56:03 -08:00
fdffe91056
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 16:55:59 -08:00
0844495710
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-22 16:55:58 -08:00
f3d55cb4f5
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-22 16:55:52 -08:00
30b961af2c
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-22 16:55:50 -08:00
3a76148338
Add a needed lib
2008-12-22 16:52:26 -08:00
9ef0280a5c
Use pthread_
2008-12-22 16:51:28 -08:00
683f0b1d6c
Fix cast
2008-12-22 16:50:44 -08:00
626df0d909
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 16:43:41 -08:00
434ab381c8
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2008-12-22 16:43:35 -08:00
5f7f6a3934
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-22 16:43:07 -08:00
ec091f4723
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-22 16:42:58 -08:00
38cb2df1a1
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 16:41:09 -08:00
704ffcb1a1
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2008-12-22 16:41:00 -08:00
049d14bb79
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 16:40:39 -08:00
44f75e4f86
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 16:40:35 -08:00
e8e738e3b9
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-22 16:40:34 -08:00
f016a8e15f
Update patch carried forward from old release
2008-12-22 16:35:36 -08:00
dabf7f88f2
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 16:34:20 -08:00
9d4268f3be
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2008-12-22 16:34:09 -08:00
06d397baa9
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-22 16:33:38 -08:00
68e000861c
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-22 16:33:29 -08:00
7ba2e4edb6
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 16:31:27 -08:00
4bdd57c914
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2008-12-22 16:31:17 -08:00
571618df63
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 16:30:48 -08:00
36c5ea8174
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 16:30:37 -08:00
43abce68c5
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-22 16:30:35 -08:00
8ab0586445
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-22 16:30:29 -08:00
a6152094d0
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-22 16:30:27 -08:00
dee065ca8d
Use pthread versions
2008-12-22 16:26:23 -08:00
6a394806f5
Prototype fixes
2008-12-22 16:18:07 -08:00
6a45d1043b
Refresh autogen products
2008-12-22 16:10:43 -08:00
7660bc4c74
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 16:09:49 -08:00
ebfc1d4742
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2008-12-22 16:09:40 -08:00
b269e2a4e8
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2008-12-22 16:09:36 -08:00
de7c07cd9a
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-22 16:09:01 -08:00
1c03bb100f
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-22 16:08:49 -08:00
cee3842c8d
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 16:06:35 -08:00
9ac24dd140
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2008-12-22 16:06:26 -08:00
8ea2bead50
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 16:06:00 -08:00
419cff0fd3
Add more more missing headers
2008-12-22 16:02:08 -08:00
575903cb9a
Comment out zfs_mount/umount
2008-12-22 16:01:04 -08:00
74006b778e
Refresh autogen products
2008-12-22 15:54:05 -08:00
301cbbdf40
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 15:53:05 -08:00
96473c9eff
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2008-12-22 15:52:59 -08:00
ea765bd3c0
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-22 15:52:44 -08:00
515c44c49a
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-22 15:52:39 -08:00
44d06dc150
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 15:51:36 -08:00
f4d792c2ad
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2008-12-22 15:51:31 -08:00
7de608e8bb
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 15:51:17 -08:00
d56b3c2440
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-22 15:51:14 -08:00
720f34ffbe
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 15:51:14 -08:00
f58a0bf4ec
Remove now unneeded verify
2008-12-22 15:49:13 -08:00
67a52f2701
Add more missing include paths
2008-12-22 15:48:05 -08:00
96a9ff084e
Refresh autogen products
2008-12-22 15:38:30 -08:00
f9baa3500d
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 15:37:58 -08:00
332ec5e7c6
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2008-12-22 15:37:53 -08:00
81d3bae7ef
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-22 15:37:39 -08:00
f369d21fa5
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-22 15:37:34 -08:00
dabe11b25c
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 15:36:35 -08:00
92528d622c
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2008-12-22 15:36:30 -08:00
42e1801037
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 15:36:18 -08:00
27dd5bca77
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 15:36:15 -08:00
1f19965f10
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-22 15:36:14 -08:00
262c2c49c1
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-22 15:36:13 -08:00
088c5451b7
Add missing include
2008-12-22 15:34:18 -08:00
9b3b373d4f
Fix prototypes, why not invalid persay. They use the traditional pre-standard form and were depricated as of C99
2008-12-22 15:33:15 -08:00
02d41bf31e
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 12:27:04 -08:00
1e9c6b3020
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2008-12-22 12:24:47 -08:00
79491b69f4
Start linux-have-zpl layer
2008-12-22 12:23:27 -08:00
08a400676b
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 12:09:15 -08:00
a6d6f31db6
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-22 12:09:08 -08:00
d7d260b870
Removing branch to readd under new name
2008-12-22 12:05:11 -08:00
4f1e40767b
Refresh autogen products
2008-12-22 11:46:00 -08:00
397cdbf7f8
Fix typo
2008-12-22 11:43:14 -08:00
31ff40b9ec
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 11:42:32 -08:00
9a57b35c98
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-22 11:42:18 -08:00
300ff503d4
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-22 11:42:13 -08:00
7b4bf789e9
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-22 11:41:50 -08:00
7f2da73568
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 11:41:11 -08:00
7c2c27b087
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2008-12-22 11:41:06 -08:00
aece7f6822
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 11:40:54 -08:00
7403ce6856
Add missing Makefile foo
2008-12-22 11:38:58 -08:00
8cc9fdcd1c
Refresh autogen products
2008-12-22 11:31:34 -08:00
8a667a0028
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 11:31:02 -08:00
b1a37a30a3
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-22 11:30:49 -08:00
87a227044e
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-22 11:30:44 -08:00
a97fc13639
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-22 11:30:21 -08:00
80952e161f
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 11:29:42 -08:00
1cea686e6b
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2008-12-22 11:29:37 -08:00
06ab7d120f
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 11:29:25 -08:00
6b1fc7b8ee
Add linker flags
2008-12-22 11:27:30 -08:00
356e666729
Add linker flags
2008-12-22 11:26:16 -08:00
9fb38f075b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 11:25:39 -08:00
24a90ad2c3
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-22 11:25:38 -08:00
34d556babb
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-22 11:25:37 -08:00
7c89e6b7d5
Fix prototype
2008-12-22 11:25:28 -08:00
75abffec39
Refresh autogen products
2008-12-22 11:10:13 -08:00
cd5f4d7e5d
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 11:09:22 -08:00
1419a88378
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-22 11:09:07 -08:00
92b3580449
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-22 11:09:02 -08:00
aa52ed7d95
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-22 11:08:39 -08:00
247ad2d25c
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 11:07:59 -08:00
6a30f2f297
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2008-12-22 11:07:55 -08:00
bf09a72b9a
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 11:07:42 -08:00
feb8953178
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 11:07:39 -08:00
b8245db563
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-22 11:07:38 -08:00
03c0e92dfa
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-22 11:07:35 -08:00
e18ac20f8c
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-22 11:07:35 -08:00
feb8aecd47
Fix prototype
2008-12-22 11:05:41 -08:00
fdd6fa0727
We don't need to #undef verify here, this is handled better now with the verify cleanup
2008-12-22 11:02:23 -08:00
4bf318d0a8
Add needed libs
2008-12-22 11:00:47 -08:00
b68bbdcf32
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 10:24:54 -08:00
00371ba18c
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-22 10:24:41 -08:00
124da899c2
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-22 10:24:36 -08:00
7debf8e578
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-22 10:24:13 -08:00
8264ba977b
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 10:23:35 -08:00
2fed020153
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2008-12-22 10:23:31 -08:00
79e25a5194
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 10:23:18 -08:00
a9e37c248d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 10:23:16 -08:00
342c4d05d6
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-22 10:23:15 -08:00
817ecade1a
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-22 10:23:14 -08:00
6da71c1404
Fix twop more missing voids in prototypes
2008-12-22 10:20:57 -08:00
31060d339c
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 10:11:33 -08:00
8b0a74c863
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2008-12-22 10:11:31 -08:00
c72d6b30e8
Remove one more header
2008-12-22 10:07:53 -08:00
8cee053327
Refresh autogen products
2008-12-22 09:28:14 -08:00
e7d9beb361
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 09:27:41 -08:00
ea48a9d80a
Resolve conflict
2008-12-22 09:27:25 -08:00
233dda723f
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-22 09:26:58 -08:00
d52676f52b
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-22 09:26:35 -08:00
c60d76734b
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 09:25:57 -08:00
b608990fea
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2008-12-22 09:25:52 -08:00
ecf38d314e
Resolve conflict
2008-12-22 09:25:04 -08:00
b58e34e0d8
Update makefiles
2008-12-22 09:22:39 -08:00
f583bf4e89
Refresh autogen products
2008-12-22 09:14:09 -08:00
bca95f1cde
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 09:13:31 -08:00
70f4b7e8c2
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-22 09:13:18 -08:00
d1ff9a15ca
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-22 09:13:13 -08:00
894c412b86
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-22 09:12:50 -08:00
4aeafba548
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 09:12:11 -08:00
7b9d830da2
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2008-12-22 09:12:06 -08:00
e959b03a8e
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 09:11:54 -08:00
98810ac9fb
Update zpool Makefile
2008-12-22 09:10:00 -08:00
cb859a27ba
Add librt for clock_gettime
2008-12-22 09:06:24 -08:00
3b465d5229
Refresh autogen products
2008-12-19 17:05:29 -08:00
Brian Behlendorf
Ricardo M. Correia