Brian Behlendorf
|
8cc9fdcd1c
|
Refresh autogen products
|
2008-12-22 11:31:34 -08:00 |
Brian Behlendorf
|
8a667a0028
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-22 11:31:02 -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
|
87a227044e
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 11:30:44 -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
|
80952e161f
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 11:29:42 -08:00 |
Brian Behlendorf
|
1cea686e6b
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 11:29:37 -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
|
75abffec39
|
Refresh autogen products
|
2008-12-22 11:10:13 -08:00 |
Brian Behlendorf
|
cd5f4d7e5d
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-22 11:09:22 -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
|
92b3580449
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 11:09:02 -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
|
247ad2d25c
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 11:07:59 -08:00 |
Brian Behlendorf
|
6a30f2f297
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 11:07:55 -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 |
Brian Behlendorf
|
b68bbdcf32
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-22 10:24:54 -08:00 |
Brian Behlendorf
|
00371ba18c
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 10:24:41 -08:00 |
Brian Behlendorf
|
124da899c2
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 10:24:36 -08:00 |
Brian Behlendorf
|
7debf8e578
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-22 10:24:13 -08:00 |
Brian Behlendorf
|
8264ba977b
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 10:23:35 -08:00 |
Brian Behlendorf
|
2fed020153
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 10:23:31 -08:00 |
Brian Behlendorf
|
79e25a5194
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:23:18 -08:00 |
Brian Behlendorf
|
a9e37c248d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 10:23:16 -08:00 |
Brian Behlendorf
|
342c4d05d6
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 10:23:15 -08:00 |
Brian Behlendorf
|
817ecade1a
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-22 10:23:14 -08:00 |
Brian Behlendorf
|
6da71c1404
|
Fix twop more missing voids in prototypes
|
2008-12-22 10:20:57 -08:00 |
Brian Behlendorf
|
31060d339c
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-22 10:11:33 -08:00 |
Brian Behlendorf
|
8b0a74c863
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:11:31 -08:00 |
Brian Behlendorf
|
c72d6b30e8
|
Remove one more header
|
2008-12-22 10:07:53 -08:00 |
Brian Behlendorf
|
8cee053327
|
Refresh autogen products
|
2008-12-22 09:28:14 -08:00 |
Brian Behlendorf
|
e7d9beb361
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-22 09:27:41 -08:00 |
Brian Behlendorf
|
ea48a9d80a
|
Resolve conflict
|
2008-12-22 09:27:25 -08:00 |
Brian Behlendorf
|
233dda723f
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 09:26:58 -08:00 |
Brian Behlendorf
|
d52676f52b
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-22 09:26:35 -08:00 |
Brian Behlendorf
|
c60d76734b
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 09:25:57 -08:00 |
Brian Behlendorf
|
b608990fea
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 09:25:52 -08:00 |
Brian Behlendorf
|
ecf38d314e
|
Resolve conflict
|
2008-12-22 09:25:04 -08:00 |
Brian Behlendorf
|
b58e34e0d8
|
Update makefiles
|
2008-12-22 09:22:39 -08:00 |
Brian Behlendorf
|
f583bf4e89
|
Refresh autogen products
|
2008-12-22 09:14:09 -08:00 |
Brian Behlendorf
|
bca95f1cde
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-22 09:13:31 -08:00 |
Brian Behlendorf
|
70f4b7e8c2
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 09:13:18 -08:00 |
Brian Behlendorf
|
d1ff9a15ca
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 09:13:13 -08:00 |
Brian Behlendorf
|
894c412b86
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-22 09:12:50 -08:00 |
Brian Behlendorf
|
4aeafba548
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 09:12:11 -08:00 |
Brian Behlendorf
|
7b9d830da2
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-22 09:12:06 -08:00 |
Brian Behlendorf
|
e959b03a8e
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 09:11:54 -08:00 |
Brian Behlendorf
|
98810ac9fb
|
Update zpool Makefile
|
2008-12-22 09:10:00 -08:00 |
Brian Behlendorf
|
cb859a27ba
|
Add librt for clock_gettime
|
2008-12-22 09:06:24 -08:00 |
Brian Behlendorf
|
3b465d5229
|
Refresh autogen products
|
2008-12-19 17:05:29 -08:00 |
Brian Behlendorf
|
1b6e301a45
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-19 17:05:02 -08:00 |
Brian Behlendorf
|
329d309e24
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 17:04:33 -08:00 |
Brian Behlendorf
|
0f083e890f
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 17:04:23 -08:00 |
Brian Behlendorf
|
d9965a52fe
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 17:03:38 -08:00 |
Brian Behlendorf
|
4ef72baea9
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-19 17:02:25 -08:00 |
Brian Behlendorf
|
0a53a422b3
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-19 17:02:16 -08:00 |
Brian Behlendorf
|
35336f33ee
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 17:01:54 -08:00 |
Brian Behlendorf
|
c8ad9946dc
|
use zlib
|
2008-12-19 16:58:20 -08:00 |
Brian Behlendorf
|
3d2e368e7a
|
Refresh autogen products
|
2008-12-19 16:12:00 -08:00 |
Brian Behlendorf
|
c312cacdc2
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-19 11:07:27 -08:00 |
Brian Behlendorf
|
01a745ee24
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 11:07:14 -08:00 |
Brian Behlendorf
|
5f5472f79c
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 11:07:10 -08:00 |
Brian Behlendorf
|
b2bf7106ed
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 11:06:46 -08:00 |
Brian Behlendorf
|
b2a86857a8
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-19 11:06:09 -08:00 |
Brian Behlendorf
|
15268640a3
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-19 11:06:05 -08:00 |
Brian Behlendorf
|
e461d277b9
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:05:52 -08:00 |
Brian Behlendorf
|
cc92d6497b
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 11:05:49 -08:00 |
Brian Behlendorf
|
d67cf69e08
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 11:05:49 -08:00 |
Brian Behlendorf
|
893a49fa9a
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 11:05:48 -08:00 |
Brian Behlendorf
|
9041f66bad
|
Fix all instances of for (int i;;) {} that were easily found
|
2008-12-19 11:03:54 -08:00 |
Brian Behlendorf
|
3da25300e3
|
Refresh autogen products
|
2008-12-18 14:02:22 -08:00 |
Brian Behlendorf
|
546961cdc0
|
Add autogen products
|
2008-12-17 16:24:56 -08:00 |
Brian Behlendorf
|
3f95673db0
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 16:24:02 -08:00 |
Brian Behlendorf
|
7a650448ed
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-17 16:23:30 -08:00 |
Brian Behlendorf
|
dd942458fd
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 16:23:22 -08:00 |
Brian Behlendorf
|
e253951a7d
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 16:22:34 -08:00 |
Brian Behlendorf
|
9f0699cc55
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 16:21:18 -08:00 |
Brian Behlendorf
|
eb5fa23261
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-17 16:21:07 -08:00 |
Brian Behlendorf
|
599e4757d3
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:20:40 -08:00 |
Brian Behlendorf
|
6481bdc3e7
|
Add -lm linker flag
|
2008-12-17 16:16:22 -08:00 |
Brian Behlendorf
|
35ee979e6c
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 14:30:24 -08:00 |
Brian Behlendorf
|
b0fbfcc592
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 14:30:22 -08:00 |
Brian Behlendorf
|
3b9d2f075b
|
Fix non-void functions without return
|
2008-12-17 14:28:28 -08:00 |
Brian Behlendorf
|
25fdaadeb0
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 14:16:22 -08:00 |
Brian Behlendorf
|
8962d81857
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 14:16:19 -08:00 |
Brian Behlendorf
|
74999392aa
|
Wrap share/mount with HAVE_ZPL
|
2008-12-17 14:05:47 -08:00 |
Brian Behlendorf
|
3ab12400a0
|
Refresh autogen products
|
2008-12-17 13:56:16 -08:00 |
Brian Behlendorf
|
e3d7813b7d
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 13:55:29 -08:00 |
Brian Behlendorf
|
10581d228d
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-17 13:55:06 -08:00 |
Brian Behlendorf
|
5029749a10
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 13:54:58 -08:00 |
Brian Behlendorf
|
772de16021
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 13:54:18 -08:00 |
Brian Behlendorf
|
7327bba1ac
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 13:53:35 -08:00 |
Brian Behlendorf
|
b1534b904a
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-17 13:53:30 -08:00 |
Brian Behlendorf
|
9956c32d10
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:53:16 -08:00 |
Brian Behlendorf
|
1dfec71003
|
Add -pthreads
|
2008-12-17 13:51:11 -08:00 |
Brian Behlendorf
|
3932b368f5
|
Refresh autogen products
|
2008-12-17 11:20:04 -08:00 |
Brian Behlendorf
|
38510987aa
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 11:19:30 -08:00 |
Brian Behlendorf
|
48dc6c7881
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-17 11:18:38 -08:00 |
Brian Behlendorf
|
a2b11e4955
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 11:18:33 -08:00 |
Brian Behlendorf
|
35257bfbd6
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 11:18:11 -08:00 |
Brian Behlendorf
|
8fd272bb0f
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 11:17:34 -08:00 |
Brian Behlendorf
|
07d457cedb
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-17 11:17:30 -08:00 |
Brian Behlendorf
|
746c17afcf
|
Resolve conflict
|
2008-12-17 11:16:41 -08:00 |
Brian Behlendorf
|
7973e77bfc
|
Re-add zpool (part of it), we need to build it for the common bits
|
2008-12-17 11:12:06 -08:00 |
Brian Behlendorf
|
49aa4dc9a2
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 10:21:50 -08:00 |
Brian Behlendorf
|
57a4d68afb
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-17 10:21:38 -08:00 |
Brian Behlendorf
|
dd44909120
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 10:21:33 -08:00 |
Brian Behlendorf
|
cf5e58fdf3
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 10:21:11 -08:00 |
Brian Behlendorf
|
f3e90811c3
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 10:20:34 -08:00 |
Brian Behlendorf
|
5e9be3d254
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-17 10:20:30 -08:00 |
Brian Behlendorf
|
e8fa895f36
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:20:18 -08:00 |
Brian Behlendorf
|
0209bfd7a4
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 10:20:16 -08:00 |
Brian Behlendorf
|
137c1015bd
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 10:20:15 -08:00 |
Brian Behlendorf
|
d4c1e8b600
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-17 10:20:14 -08:00 |
Brian Behlendorf
|
087b2876bb
|
Fix NULL should be 0 usage
|
2008-12-17 10:18:09 -08:00 |
Brian Behlendorf
|
c889be9749
|
Refresh autogen products
|
2008-12-17 09:55:38 -08:00 |
Brian Behlendorf
|
f7b808da4b
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 09:26:13 -08:00 |
Brian Behlendorf
|
f862667bdd
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-17 09:26:00 -08:00 |
Brian Behlendorf
|
2e7ed86503
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 09:25:56 -08:00 |
Brian Behlendorf
|
f2fff13c54
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 09:25:35 -08:00 |
Brian Behlendorf
|
96cec6e130
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 09:24:59 -08:00 |
Brian Behlendorf
|
8fd2f18808
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-17 09:24:55 -08:00 |
Brian Behlendorf
|
aefe272f78
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:24:43 -08:00 |
Brian Behlendorf
|
640c2f8d7e
|
Add missing includes to zfs cmd Makefile.am
|
2008-12-17 09:22:40 -08:00 |
Brian Behlendorf
|
93e36205ba
|
Refresh autogen products
|
2008-12-16 17:01:31 -08:00 |
Brian Behlendorf
|
a82f09c95b
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 17:00:28 -08:00 |
Brian Behlendorf
|
31c66ae5a2
|
Resolve conflict
|
2008-12-16 17:00:12 -08:00 |
Brian Behlendorf
|
55899e4342
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-16 16:59:07 -08:00 |
Brian Behlendorf
|
4b20a8e329
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 16:58:28 -08:00 |
Brian Behlendorf
|
100639c1a0
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-16 16:57:27 -08:00 |
Brian Behlendorf
|
d5e8ca0b5f
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-16 16:57:20 -08:00 |
Brian Behlendorf
|
76e071352b
|
Resolve conflict
|
2008-12-16 16:55:53 -08:00 |
Brian Behlendorf
|
1e64eb4c07
|
Update makefiles for currently working tools
|
2008-12-16 16:51:23 -08:00 |
Brian Behlendorf
|
d918e8e97d
|
Refresh autogen products
|
2008-12-16 09:12:43 -08:00 |
Brian Behlendorf
|
b7374fc81b
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 09:06:51 -08:00 |
Brian Behlendorf
|
de5a98ba28
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-16 09:06:24 -08:00 |
Brian Behlendorf
|
bf01b1ccdf
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-16 09:06:12 -08:00 |
Brian Behlendorf
|
151ee60cbf
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 09:05:02 -08:00 |
Brian Behlendorf
|
589a6c72d6
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-16 09:03:27 -08:00 |
Brian Behlendorf
|
4504aa575b
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-16 09:03:17 -08:00 |
Brian Behlendorf
|
3ba34afff8
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-16 09:02:49 -08:00 |
Brian Behlendorf
|
a7b063d224
|
Add DEFAULT_INCLUDE to rules, adjust = to += accordingly
|
2008-12-16 08:58:41 -08:00 |
Brian Behlendorf
|
bffca6c378
|
Refresh autogen products
|
2008-12-15 16:58:02 -08:00 |
Brian Behlendorf
|
52de958498
|
Refresh autogen products
|
2008-12-12 12:17:51 -08:00 |
Brian Behlendorf
|
7297c6d959
|
Refresh autogen products
|
2008-12-12 10:31:54 -08:00 |
Brian Behlendorf
|
609680b177
|
Refresh autogen products
|
2008-12-12 10:20:55 -08:00 |
Brian Behlendorf
|
371162346a
|
Add autogen products
|
2008-12-12 09:35:47 -08:00 |
Brian Behlendorf
|
212ec0c394
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 09:34:36 -08:00 |
Brian Behlendorf
|
303503be4d
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-12 09:34:34 -08:00 |
Brian Behlendorf
|
56f1015f8b
|
Refresh Makefile.am
|
2008-12-12 09:32:53 -08:00 |
Brian Behlendorf
|
3b4adb0abd
|
Add all autogen products
|
2008-12-12 09:25:06 -08:00 |
Brian Behlendorf
|
8169eb1040
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-12 09:23:32 -08:00 |
Brian Behlendorf
|
450502ec0b
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 09:23:28 -08:00 |
Brian Behlendorf
|
bc031993d7
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 09:23:08 -08:00 |
Brian Behlendorf
|
7f2347ed6c
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 09:22:34 -08:00 |
Brian Behlendorf
|
ec1c8e9315
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-12 09:22:30 -08:00 |
Brian Behlendorf
|
c1a800e4c5
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 09:22:19 -08:00 |
Brian Behlendorf
|
7005de9a0c
|
Refresh Makefile.am's
|
2008-12-12 09:20:33 -08:00 |
Brian Behlendorf
|
fe0cad8ba9
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:59:38 -08:00 |
Brian Behlendorf
|
bc1ce928f6
|
Add makefiles
|
2008-12-12 08:57:54 -08:00 |
Brian Behlendorf
|
9752c0ae90
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-12 08:53:28 -08:00 |
Brian Behlendorf
|
06c36a4115
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 08:53:24 -08:00 |
Brian Behlendorf
|
370d47306c
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 08:53:03 -08:00 |
Brian Behlendorf
|
579ce8f9b7
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 08:52:28 -08:00 |
Brian Behlendorf
|
690e4461e6
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-12 08:52:24 -08:00 |
Brian Behlendorf
|
9e66117d33
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:13 -08:00 |
Brian Behlendorf
|
d4ae03c700
|
Add initial stub makefile, details need filling in
|
2008-12-12 08:50:07 -08:00 |
Brian Behlendorf
|
f5290f405c
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:19:18 -08:00 |
Brian Behlendorf
|
fc5f5929e7
|
move zpios to the correct dirs
|
2008-12-11 15:17:33 -08:00 |
Brian Behlendorf
|
645c51287f
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-11 11:37:35 -08:00 |
Brian Behlendorf
|
11e1ce8c2e
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-11 11:36:50 -08:00 |
Brian Behlendorf
|
1b0348e335
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-11 11:35:29 -08:00 |
Brian Behlendorf
|
a9ec92e894
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-11 11:35:19 -08:00 |
Brian Behlendorf
|
aca9d98817
|
Fix conflict
|
2008-12-11 11:34:16 -08:00 |
Brian Behlendorf
|
f07f82e93a
|
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
|
2008-12-11 11:26:43 -08:00 |
Brian Behlendorf
|
756a122d37
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-11 11:25:42 -08:00 |
Brian Behlendorf
|
b342e90e44
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2008-12-11 11:24:51 -08:00 |
Brian Behlendorf
|
4f5d567cfd
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-11 11:24:45 -08:00 |
Brian Behlendorf
|
3420896332
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-11 11:24:42 -08:00 |
Brian Behlendorf
|
172bb4bd5e
|
Move the world out of /zfs/ and seperate out module build tree
|
2008-12-11 11:08:09 -08:00 |