Brian Behlendorf
|
de9d49a2b4
|
Minor mutex tweaks
|
2008-12-12 13:38:13 -08:00 |
|
Brian Behlendorf
|
b127f72a15
|
Resolve mutex conflict
|
2008-12-12 12:55:33 -08:00 |
|
Brian Behlendorf
|
ab95bc7c7b
|
Add missing ;
|
2008-12-12 12:21:58 -08:00 |
|
Brian Behlendorf
|
1ff495a2cc
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 12:16:41 -08:00 |
|
Brian Behlendorf
|
ac9f5a5af0
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-12 12:13:43 -08:00 |
|
Brian Behlendorf
|
0f99484285
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-12 12:13:41 -08:00 |
|
Brian Behlendorf
|
95f0795156
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-12 12:13:39 -08:00 |
|
Brian Behlendorf
|
769681a8b9
|
Trivial umem implementation if portable umem unavailable
|
2008-12-12 12:10:00 -08:00 |
|
Brian Behlendorf
|
ea6e9380e7
|
Add void to prototype
|
2008-12-12 11:12:11 -08:00 |
|
Brian Behlendorf
|
bbaded4a68
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 11:07:48 -08:00 |
|
Brian Behlendorf
|
ded433714f
|
Refine Makefiles
|
2008-12-12 11:04:44 -08:00 |
|
Brian Behlendorf
|
33833181c1
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 11:00:07 -08:00 |
|
Brian Behlendorf
|
9fbc572a59
|
Refine Makefiles
|
2008-12-12 10:57:05 -08:00 |
|
Brian Behlendorf
|
bef1b1cd5b
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 10:45:38 -08:00 |
|
Brian Behlendorf
|
d7ec1ed532
|
Refine Makefiles
|
2008-12-12 10:43:39 -08:00 |
|
Brian Behlendorf
|
6d0d603ee1
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 10:38:51 -08:00 |
|
Brian Behlendorf
|
76e1c54125
|
Refine Makefiles
|
2008-12-12 10:36:14 -08:00 |
|
Brian Behlendorf
|
d06634c325
|
Resolve shadow conflict with 'link' local
|
2008-12-12 10:24:38 -08:00 |
|
Brian Behlendorf
|
662df0d70a
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 10:13:19 -08:00 |
|
Brian Behlendorf
|
6d78e69193
|
Add missing include patch
|
2008-12-12 10:10:16 -08:00 |
|
Brian Behlendorf
|
2e0a5f5461
|
Refresh makefiles and configure.ac
|
2008-12-12 09:30:42 -08:00 |
|
Brian Behlendorf
|
983c10c8c1
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 09:23:36 -08:00 |
|
Brian Behlendorf
|
7005de9a0c
|
Refresh Makefile.am's
|
2008-12-12 09:20:33 -08:00 |
|
Brian Behlendorf
|
85e026f310
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 08:53:32 -08:00 |
|
Brian Behlendorf
|
d4ae03c700
|
Add initial stub makefile, details need filling in
|
2008-12-12 08:50:07 -08:00 |
|
Brian Behlendorf
|
3540a5e4e5
|
Readd
|
2008-12-11 16:46:07 -08:00 |
|
Brian Behlendorf
|
e0104bd422
|
Remove so they can be easily readded
|
2008-12-11 16:41:23 -08:00 |
|
Brian Behlendorf
|
a928ca95fc
|
Add to Makefile.am
|
2008-12-11 16:25:33 -08:00 |
|
Brian Behlendorf
|
9eb741a1fe
|
Readd missing header
|
2008-12-11 16:23:35 -08:00 |
|
Brian Behlendorf
|
a0e625a878
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-11 15:41:52 -08:00 |
|
Brian Behlendorf
|
182754d11a
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-11 15:41:48 -08:00 |
|
Brian Behlendorf
|
7e85cefdc5
|
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
|
2008-12-11 15:41:28 -08:00 |
|
Brian Behlendorf
|
57799b7b5a
|
Resolve conflict
|
2008-12-11 15:40:14 -08:00 |
|
Brian Behlendorf
|
3399113552
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-11 15:39:25 -08:00 |
|
Brian Behlendorf
|
6b2c60acca
|
Moving lib/libspl to linux-libspl branch
|
2008-12-11 15:38:59 -08:00 |
|
Brian Behlendorf
|
1d99f33ba7
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-11 15:37:37 -08:00 |
|
Brian Behlendorf
|
cf06f2f58f
|
Whoops put these back
|
2008-12-11 15:34:32 -08:00 |
|
Brian Behlendorf
|
652388f3fb
|
Moving all lib/libspl contexts to linux-libspl branch
|
2008-12-11 15:31:48 -08:00 |
|
Brian Behlendorf
|
d46b60f374
|
Move libspl to new location
|
2008-12-11 15:06:34 -08:00 |
|
Brian Behlendorf
|
be5e4ee04f
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-11 15:00:50 -08:00 |
|
Brian Behlendorf
|
593aa3e10d
|
Move all current Makefiles to correct locations, updates still needed
|
2008-12-11 14:55:55 -08:00 |
|
Brian Behlendorf
|
a4a44a76d4
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-11 14:27:09 -08:00 |
|
Brian Behlendorf
|
503068ecec
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-11 14:25:32 -08:00 |
|
Brian Behlendorf
|
b8294b1311
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-11 14:25:05 -08:00 |
|
Brian Behlendorf
|
c325ac879c
|
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
|
2008-12-11 14:24:56 -08:00 |
|
Brian Behlendorf
|
82c8f9af50
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-11 14:24:49 -08:00 |
|
Brian Behlendorf
|
9b3c631dbd
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-11 14:24:48 -08:00 |
|
Brian Behlendorf
|
a4076c7544
|
Script updates
|
2008-12-11 14:21:14 -08:00 |
|
Brian Behlendorf
|
c4911ece24
|
Move library files to lib
|
2008-12-11 14:16:55 -08:00 |
|
Brian Behlendorf
|
a400443ecf
|
Resolve conflict
|
2008-12-11 14:07:08 -08:00 |