Brian Behlendorf
|
da7151a89e
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:11:19 -08:00 |
|
Brian Behlendorf
|
3fa768e21b
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:04:35 -08:00 |
|
Brian Behlendorf
|
d3df6b2012
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2009-01-15 14:01:51 -08:00 |
|
Brian Behlendorf
|
fb5f0bc833
|
Rebase master to b105
|
2009-01-15 13:59:39 -08:00 |
|
Brian Behlendorf
|
9339984f08
|
Resolve conflict
|
2009-01-14 16:04:33 -08:00 |
|
Brian Behlendorf
|
9e40470aa0
|
Resolve conflict
|
2009-01-14 15:42:28 -08:00 |
|
Brian Behlendorf
|
9c22d76019
|
Minor 'make check' updates
|
2009-01-14 15:38:56 -08:00 |
|
Brian Behlendorf
|
24ee934b8b
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-01-14 13:39:05 -08:00 |
|
Brian Behlendorf
|
6db77d2fe2
|
Add linux-ztest branch
|
2009-01-14 13:38:07 -08:00 |
|
Brian Behlendorf
|
50832652c2
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-14 08:42:33 -08:00 |
|
Brian Behlendorf
|
1194e0412f
|
Change all instances of kpios to zpios
|
2009-01-14 08:38:35 -08:00 |
|
Brian Behlendorf
|
0e00972b2a
|
Resolve conflict
|
2009-01-05 12:42:30 -08:00 |
|
Brian Behlendorf
|
9a0cb95b1b
|
Resolve conflict
|
2009-01-05 12:38:23 -08:00 |
|
Brian Behlendorf
|
ce7115b807
|
Add unicode makefile references and support
|
2009-01-05 12:33:09 -08:00 |
|
Brian Behlendorf
|
fa7980f197
|
Remove zdump
|
2009-01-05 11:22:57 -08:00 |
|
Brian Behlendorf
|
e3b6de2c22
|
Remove zdump
|
2009-01-05 11:20:33 -08:00 |
|
Brian Behlendorf
|
6fd7b17036
|
Remove remaining zdump Makefile references
|
2009-01-05 11:18:06 -08:00 |
|
Brian Behlendorf
|
3767655021
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-05 11:16:11 -08:00 |
|
Brian Behlendorf
|
ef0ca51855
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-05 11:14:50 -08:00 |
|
Brian Behlendorf
|
88ddd54799
|
Remove zdump Makefiles
|
2009-01-05 11:12:44 -08:00 |
|
Brian Behlendorf
|
578a1db888
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-05 11:11:56 -08:00 |
|
Brian Behlendorf
|
e5547d3cbf
|
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
|
2009-01-05 11:11:47 -08:00 |
|
Brian Behlendorf
|
adc6253cbf
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-05 11:11:33 -08:00 |
|
Brian Behlendorf
|
148d093b76
|
Remove zdump.c
|
2009-01-05 11:11:02 -08:00 |
|
Brian Behlendorf
|
1ed474aa0d
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2009-01-05 11:10:31 -08:00 |
|
Brian Behlendorf
|
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 |
|
Brian Behlendorf
|
8888d3d650
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-23 09:44:52 -08:00 |
|
Brian Behlendorf
|
2475a871b0
|
Minimal include set
|
2008-12-23 09:42:55 -08:00 |
|
Brian Behlendorf
|
4230c743cd
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-23 09:26:10 -08:00 |
|
Brian Behlendorf
|
fe119cee57
|
Minor zpios cleanup
|
2008-12-23 09:24:19 -08:00 |
|
Brian Behlendorf
|
fe23f773a7
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 16:58:20 -08:00 |
|
Brian Behlendorf
|
4bbb394a8a
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:56:03 -08:00 |
|
Brian Behlendorf
|
fdffe91056
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 16:55:59 -08:00 |
|
Brian Behlendorf
|
0844495710
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-22 16:55:58 -08:00 |
|
Brian Behlendorf
|
f3d55cb4f5
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 16:55:52 -08:00 |
|
Brian Behlendorf
|
30b961af2c
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-22 16:55:50 -08:00 |
|
Brian Behlendorf
|
3a76148338
|
Add a needed lib
|
2008-12-22 16:52:26 -08:00 |
|
Brian Behlendorf
|
9ef0280a5c
|
Use pthread_
|
2008-12-22 16:51:28 -08:00 |
|
Brian Behlendorf
|
683f0b1d6c
|
Fix cast
|
2008-12-22 16:50:44 -08:00 |
|
Brian Behlendorf
|
5f7f6a3934
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 16:43:07 -08:00 |
|
Brian Behlendorf
|
049d14bb79
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:40:39 -08:00 |
|
Brian Behlendorf
|
44f75e4f86
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 16:40:35 -08:00 |
|
Brian Behlendorf
|
e8e738e3b9
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-22 16:40:34 -08:00 |
|
Brian Behlendorf
|
f016a8e15f
|
Update patch carried forward from old release
|
2008-12-22 16:35:36 -08:00 |
|
Brian Behlendorf
|
06d397baa9
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 16:33:38 -08:00 |
|
Brian Behlendorf
|
571618df63
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:30:48 -08:00 |
|
Brian Behlendorf
|
36c5ea8174
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 16:30:37 -08:00 |
|
Brian Behlendorf
|
43abce68c5
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-22 16:30:35 -08:00 |
|
Brian Behlendorf
|
8ab0586445
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 16:30:29 -08:00 |
|
Brian Behlendorf
|
a6152094d0
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-22 16:30:27 -08:00 |
|
Brian Behlendorf
|
dee065ca8d
|
Use pthread versions
|
2008-12-22 16:26:23 -08:00 |
|
Brian Behlendorf
|
6a394806f5
|
Prototype fixes
|
2008-12-22 16:18:07 -08:00 |
|
Brian Behlendorf
|
ebfc1d4742
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:09:40 -08:00 |
|
Brian Behlendorf
|
b269e2a4e8
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-22 16:09:36 -08:00 |
|
Brian Behlendorf
|
de7c07cd9a
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 16:09:01 -08:00 |
|
Brian Behlendorf
|
8ea2bead50
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 16:06:00 -08:00 |
|
Brian Behlendorf
|
419cff0fd3
|
Add more more missing headers
|
2008-12-22 16:02:08 -08:00 |
|
Brian Behlendorf
|
575903cb9a
|
Comment out zfs_mount/umount
|
2008-12-22 16:01:04 -08:00 |
|
Brian Behlendorf
|
96473c9eff
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-22 15:52:59 -08:00 |
|
Brian Behlendorf
|
ea765bd3c0
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 15:52:44 -08:00 |
|
Brian Behlendorf
|
7de608e8bb
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:51:17 -08:00 |
|
Brian Behlendorf
|
d56b3c2440
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-22 15:51:14 -08:00 |
|
Brian Behlendorf
|
720f34ffbe
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 15:51:14 -08:00 |
|
Brian Behlendorf
|
f58a0bf4ec
|
Remove now unneeded verify
|
2008-12-22 15:49:13 -08:00 |
|
Brian Behlendorf
|
67a52f2701
|
Add more missing include paths
|
2008-12-22 15:48:05 -08:00 |
|
Brian Behlendorf
|
332ec5e7c6
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-22 15:37:53 -08:00 |
|
Brian Behlendorf
|
81d3bae7ef
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 15:37:39 -08:00 |
|
Brian Behlendorf
|
42e1801037
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:36:18 -08:00 |
|
Brian Behlendorf
|
27dd5bca77
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 15:36:15 -08:00 |
|
Brian Behlendorf
|
1f19965f10
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 15:36:14 -08:00 |
|
Brian Behlendorf
|
262c2c49c1
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-22 15:36:13 -08:00 |
|
Brian Behlendorf
|
088c5451b7
|
Add missing include
|
2008-12-22 15:34:18 -08:00 |
|
Brian Behlendorf
|
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 |
|
Brian Behlendorf
|
1e9c6b3020
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:24:47 -08:00 |
|
Brian Behlendorf
|
79491b69f4
|
Start linux-have-zpl layer
|
2008-12-22 12:23:27 -08:00 |
|
Brian Behlendorf
|
a6d6f31db6
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:09:08 -08:00 |
|
Brian Behlendorf
|
d7d260b870
|
Removing branch to readd under new name
|
2008-12-22 12:05:11 -08:00 |
|
Brian Behlendorf
|
9a57b35c98
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 11:42:18 -08:00 |
|
Brian Behlendorf
|
7b4bf789e9
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-22 11:41:50 -08:00 |
|
Brian Behlendorf
|
aece7f6822
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:40:54 -08:00 |
|
Brian Behlendorf
|
7403ce6856
|
Add missing Makefile foo
|
2008-12-22 11:38:58 -08:00 |
|
Brian Behlendorf
|
b1a37a30a3
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 11:30:49 -08:00 |
|
Brian Behlendorf
|
a97fc13639
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-22 11:30:21 -08:00 |
|
Brian Behlendorf
|
06ab7d120f
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:29:25 -08:00 |
|
Brian Behlendorf
|
6b1fc7b8ee
|
Add linker flags
|
2008-12-22 11:27:30 -08:00 |
|
Brian Behlendorf
|
356e666729
|
Add linker flags
|
2008-12-22 11:26:16 -08:00 |
|
Brian Behlendorf
|
9fb38f075b
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 11:25:39 -08:00 |
|
Brian Behlendorf
|
24a90ad2c3
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 11:25:38 -08:00 |
|
Brian Behlendorf
|
34d556babb
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-22 11:25:37 -08:00 |
|
Brian Behlendorf
|
7c89e6b7d5
|
Fix prototype
|
2008-12-22 11:25:28 -08:00 |
|
Brian Behlendorf
|
1419a88378
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 11:09:07 -08:00 |
|
Brian Behlendorf
|
aa52ed7d95
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-22 11:08:39 -08:00 |
|
Brian Behlendorf
|
bf09a72b9a
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:07:42 -08:00 |
|
Brian Behlendorf
|
feb8953178
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 11:07:39 -08:00 |
|
Brian Behlendorf
|
b8245db563
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-22 11:07:38 -08:00 |
|
Brian Behlendorf
|
03c0e92dfa
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-22 11:07:35 -08:00 |
|
Brian Behlendorf
|
e18ac20f8c
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 11:07:35 -08:00 |
|
Brian Behlendorf
|
feb8aecd47
|
Fix prototype
|
2008-12-22 11:05:41 -08:00 |
|
Brian Behlendorf
|
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 |
|
Brian Behlendorf
|
4bf318d0a8
|
Add needed libs
|
2008-12-22 11:00:47 -08:00 |