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 |