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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
b8d37fd38d
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2008-12-22 16:56:25 -08:00
Brian Behlendorf
Ricardo M. Correia