Brian Behlendorf
|
be3d928df8
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-15 16:53:59 -08:00 |
|
Brian Behlendorf
|
cc420402bf
|
Moving addition configure checks to m4 macros
|
2008-12-15 16:46:34 -08:00 |
|
Brian Behlendorf
|
c798730bdd
|
Conflict
|
2008-12-15 16:34:48 -08:00 |
|
Brian Behlendorf
|
2712912cb8
|
Use old autoconf stratagy
|
2008-12-15 16:27:22 -08:00 |
|
Brian Behlendorf
|
06418073d4
|
Move libefi check to libefi topic branch
|
2008-12-15 10:54:53 -08:00 |
|
Brian Behlendorf
|
6e0de77777
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-15 10:45:25 -08:00 |
|
Brian Behlendorf
|
574e2cec0d
|
Minor context change to ease merging
|
2008-12-15 10:41:15 -08:00 |
|
Brian Behlendorf
|
2bdf9cfae3
|
Moving all kernel+user configure magic to the correct topic branches where the features are introduced or needed
|
2008-12-15 10:40:22 -08:00 |
|
Brian Behlendorf
|
6f1e9b9047
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-15 10:30:28 -08:00 |
|
Brian Behlendorf
|
e631cff898
|
Remove lustre config, we really shouldn't need this. A user space build -should- be able to contain all the needed APIs. If this is not the case we can reintroduce this.
|
2008-12-15 10:28:14 -08:00 |
|
Brian Behlendorf
|
f73fee417e
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 16:27:04 -08:00 |
|
Brian Behlendorf
|
0e8ac26fc9
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-12 16:23:07 -08:00 |
|
Brian Behlendorf
|
08a8860091
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-12 16:23:04 -08:00 |
|
Brian Behlendorf
|
acfdfe6ed7
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-12 16:23:01 -08:00 |
|
Brian Behlendorf
|
eee73dd80e
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-12 16:22:59 -08:00 |
|
Brian Behlendorf
|
d0c573f27e
|
Add in the reset of the pthread changes
|
2008-12-12 16:16:06 -08:00 |
|
Brian Behlendorf
|
8917e616ba
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 15:06:57 -08:00 |
|
Brian Behlendorf
|
d145044d80
|
Refresh Makefile
|
2008-12-12 15:04:48 -08:00 |
|
Brian Behlendorf
|
d17d4bccd4
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 14:56:35 -08:00 |
|
Brian Behlendorf
|
f154348ca9
|
Update Makefile
|
2008-12-12 14:52:43 -08:00 |
|
Brian Behlendorf
|
d2fb78a491
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 14:43:53 -08:00 |
|
Brian Behlendorf
|
cf89e6e4b3
|
Refresh Makefile
|
2008-12-12 14:37:13 -08:00 |
|
Brian Behlendorf
|
73b709fa62
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 14:29:12 -08:00 |
|
Brian Behlendorf
|
50532fe67b
|
Refresh Makefile
|
2008-12-12 14:27:04 -08:00 |
|
Brian Behlendorf
|
2051c5740b
|
Refresh Makefile
|
2008-12-12 14:26:14 -08:00 |
|
Brian Behlendorf
|
ea758a9eea
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 14:20:46 -08:00 |
|
Brian Behlendorf
|
5a27f3f0a5
|
Comment out libzpool builds for now
|
2008-12-12 14:16:50 -08:00 |
|
Brian Behlendorf
|
f411872648
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 14:01:25 -08:00 |
|
Brian Behlendorf
|
01db09fde5
|
Collapse libzcommon in to libzpool
|
2008-12-12 13:57:47 -08:00 |
|
Brian Behlendorf
|
8ab105204a
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 13:47:16 -08:00 |
|
Brian Behlendorf
|
de9d8a193f
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2008-12-12 13:46:57 -08:00 |
|
Brian Behlendorf
|
9ba40d2bfa
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-12 13:46:57 -08:00 |
|
Brian Behlendorf
|
b37a410117
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2008-12-12 13:46:56 -08:00 |
|
Brian Behlendorf
|
6da8e28ab6
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2008-12-12 13:46:56 -08:00 |
|
Brian Behlendorf
|
6f3a9cb131
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2008-12-12 13:46:56 -08:00 |
|
Brian Behlendorf
|
2ffe84f024
|
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
|
2008-12-12 13:46:55 -08:00 |
|
Brian Behlendorf
|
240084a033
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2008-12-12 13:46:54 -08:00 |
|
Brian Behlendorf
|
a9e9f0cd45
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-12 13:46:53 -08:00 |
|
Brian Behlendorf
|
053bd1203d
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-12 13:46:52 -08:00 |
|
Brian Behlendorf
|
37f7a4c86b
|
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
|
2008-12-12 13:46:52 -08:00 |
|
Brian Behlendorf
|
abea56a45f
|
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
|
2008-12-12 13:46:52 -08:00 |
|
Brian Behlendorf
|
48e775ecfc
|
Merge branch 'fix-stack' into refs/top-bases/fix-branch
|
2008-12-12 13:46:51 -08:00 |
|
Brian Behlendorf
|
f4bc961bcc
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2008-12-12 13:46:50 -08:00 |
|
Brian Behlendorf
|
12081e20dd
|
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
|
2008-12-12 13:46:49 -08:00 |
|
Brian Behlendorf
|
9064b819f0
|
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
|
2008-12-12 13:46:49 -08:00 |
|
Brian Behlendorf
|
204f1a0552
|
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
|
2008-12-12 13:46:48 -08:00 |
|
Brian Behlendorf
|
d0a71781ca
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-12 13:46:48 -08:00 |
|
Brian Behlendorf
|
0ce1ed271c
|
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
|
2008-12-12 13:46:47 -08:00 |
|
Brian Behlendorf
|
8eee4b7531
|
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
|
2008-12-12 13:46:47 -08:00 |
|
Brian Behlendorf
|
eb83f9e5cc
|
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
|
2008-12-12 13:46:46 -08:00 |