Brian Behlendorf
|
2c2372389a
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:24:23 -08:00 |
Brian Behlendorf
|
7df95c2f31
|
Add missing header
|
2008-12-16 14:22:31 -08:00 |
Brian Behlendorf
|
33dc3053c0
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 14:19:57 -08:00 |
Brian Behlendorf
|
e583bf8b9e
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:19:55 -08:00 |
Brian Behlendorf
|
f6207ec73a
|
Add missing headers
|
2008-12-16 14:17:29 -08:00 |
Brian Behlendorf
|
8417375410
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 14:12:50 -08:00 |
Brian Behlendorf
|
52a453edaa
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:12:48 -08:00 |
Brian Behlendorf
|
9df591c9d3
|
Add sys/mount.h header
|
2008-12-16 14:10:43 -08:00 |
Brian Behlendorf
|
a7eef78148
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 14:07:02 -08:00 |
Brian Behlendorf
|
554defd465
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:07:00 -08:00 |
Brian Behlendorf
|
12cb53ce52
|
Make SHARENFS condition with ZPL
|
2008-12-16 14:05:09 -08:00 |
Brian Behlendorf
|
2b2ceaed9b
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 13:31:49 -08:00 |
Brian Behlendorf
|
ac3a2f3476
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-16 13:31:42 -08:00 |
Brian Behlendorf
|
33072dc1bc
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 13:31:13 -08:00 |
Brian Behlendorf
|
8342056a8a
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-16 13:30:38 -08:00 |
Brian Behlendorf
|
1d4b1187d7
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:30:23 -08:00 |
Brian Behlendorf
|
527e38c72b
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-16 13:30:21 -08:00 |
Brian Behlendorf
|
34b937c016
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-16 13:30:21 -08:00 |
Brian Behlendorf
|
f693a600d0
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-16 13:30:20 -08:00 |
Brian Behlendorf
|
206a3ac58c
|
Resolve 2 more shadow conflicts
|
2008-12-16 13:28:23 -08:00 |
Brian Behlendorf
|
1eee786f73
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 13:22:51 -08:00 |
Brian Behlendorf
|
e329093faf
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-16 13:22:44 -08:00 |
Brian Behlendorf
|
c78fdcb14a
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 13:22:15 -08:00 |
Brian Behlendorf
|
1d4d3c5fa8
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-16 13:21:41 -08:00 |
Brian Behlendorf
|
b22a5e18fe
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:21:25 -08:00 |
Brian Behlendorf
|
60ad9afc28
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-16 13:21:23 -08:00 |
Brian Behlendorf
|
5af8235e41
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-16 13:21:23 -08:00 |
Brian Behlendorf
|
f82621d7cb
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-16 13:19:26 -08:00 |
Brian Behlendorf
|
5383875500
|
Create gcc-shadow branch
|
2008-12-16 13:19:01 -08:00 |
Brian Behlendorf
|
e16553fdc8
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 10:16:02 -08:00 |
Brian Behlendorf
|
01918870b4
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-16 10:16:00 -08:00 |
Brian Behlendorf
|
e7d7f1803f
|
Remove unused hunk
|
2008-12-16 10:14:08 -08:00 |
Brian Behlendorf
|
fe0f9ebd5c
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 10:13:44 -08:00 |
Brian Behlendorf
|
3112028a39
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-16 10:13:43 -08:00 |
Brian Behlendorf
|
b62b556896
|
Moving unused hunk to unused patch
|
2008-12-16 10:11:41 -08:00 |
Brian Behlendorf
|
e7a0278475
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 09:57:20 -08:00 |
Brian Behlendorf
|
c26de31159
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 09:57:17 -08:00 |
Brian Behlendorf
|
e518437bbe
|
Add 3 missing headers
|
2008-12-16 09:54:42 -08:00 |
Brian Behlendorf
|
2e6486a1bf
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 09:45:17 -08:00 |
Brian Behlendorf
|
94d80663d7
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-16 09:43:38 -08:00 |
Brian Behlendorf
|
236abf7d17
|
Remove assfail() chunk, it just complicates things and is never used
|
2008-12-16 09:42:41 -08:00 |
Brian Behlendorf
|
4407c9249a
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 09:40:38 -08:00 |
Brian Behlendorf
|
4b3b2a56d2
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 09:40:35 -08:00 |
Brian Behlendorf
|
4d6a2499f6
|
Minor update to assert, pull include_next out of ifdef
|
2008-12-16 09:35:40 -08:00 |
Brian Behlendorf
|
d918e8e97d
|
Refresh autogen products
|
2008-12-16 09:12:43 -08:00 |
Brian Behlendorf
|
fada236349
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 09:11:01 -08:00 |
Brian Behlendorf
|
d5a8919126
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 09:10:58 -08:00 |
Brian Behlendorf
|
b0b1c43c46
|
Add += for DEFAULT_INCLUDES
|
2008-12-16 09:08: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
|
eb2a7c5200
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-16 09:06:37 -08:00 |
Brian Behlendorf
|
4f488ec6e4
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-16 09:06:01 -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
|
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
|
a3f0afc0b2
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 08:48:58 -08:00 |
Brian Behlendorf
|
c0abfccb28
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 08:48:49 -08:00 |
Brian Behlendorf
|
b74b9388b9
|
Add zfs_config include
|
2008-12-16 08:44:37 -08:00 |
Brian Behlendorf
|
bffca6c378
|
Refresh autogen products
|
2008-12-15 16:58:02 -08:00 |
Brian Behlendorf
|
aae097e010
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-15 10:02:35 -08:00 |
Brian Behlendorf
|
617be506e6
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:02:33 -08:00 |
Brian Behlendorf
|
5a17b1401d
|
Add unistd.h include config magic
|
2008-12-15 10:00:43 -08:00 |
Brian Behlendorf
|
b5e5c5c4a6
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-15 09:36:45 -08:00 |
Brian Behlendorf
|
4846f3140a
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 09:36:39 -08:00 |
Brian Behlendorf
|
5fd645e47a
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-15 09:36:37 -08:00 |
Brian Behlendorf
|
579f6e603f
|
Remove incorrect mapping from verify to assert. We should be using the more correct version in lib/libzpool/include/sys/zfs_context.h which will not optimize out the actual call in the assert based on NDEBUG
|
2008-12-15 09:29:26 -08:00 |
Brian Behlendorf
|
228b31e100
|
Add va_list include
|
2008-12-15 09:27:38 -08:00 |
Brian Behlendorf
|
7c2f9c0aae
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-15 09:12:49 -08:00 |
Brian Behlendorf
|
9e00f970ec
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 09:12:46 -08:00 |
Brian Behlendorf
|
e1357f07c0
|
Add libshare.h stub
|
2008-12-15 09:10:33 -08:00 |
Brian Behlendorf
|
ee209a7614
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 16:30:32 -08:00 |
Brian Behlendorf
|
b35bef8df2
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 16:29:31 -08:00 |
Brian Behlendorf
|
5e125dc8b1
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 16:28:28 -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
|
416157170a
|
Resolve conflict
|
2008-12-12 16:25:01 -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
|
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
|
b7a979da7b
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 16:09:38 -08:00 |
Brian Behlendorf
|
c264712b93
|
Merge branch 'linux-context' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:09:33 -08:00 |
Brian Behlendorf
|
d07c7914a0
|
Refresh context for assert
|
2008-12-12 16:02:48 -08:00 |
Brian Behlendorf
|
9bc5ab5651
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 15:58:10 -08:00 |
Brian Behlendorf
|
6c859b40d7
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:58:07 -08:00 |
Brian Behlendorf
|
0c575736b6
|
Make this primatives conditional to not conflict with context
|
2008-12-12 15:56:06 -08:00 |
Brian Behlendorf
|
15218256e4
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 15:37:44 -08:00 |
Brian Behlendorf
|
b978916b98
|
Merge branch 'linux-context' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:36:18 -08:00 |
Brian Behlendorf
|
ac35c9f782
|
Minor verify tweak
|
2008-12-12 15:35:12 -08:00 |
Brian Behlendorf
|
ef88744480
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 15:28:33 -08:00 |
Brian Behlendorf
|
7b363155b3
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:28:31 -08:00 |
Brian Behlendorf
|
5b4fa8eb54
|
Revert libzfs hunk
|
2008-12-12 15:26:39 -08:00 |
Brian Behlendorf
|
a64c093aae
|
Refresh autogen products
|
2008-12-12 15:18:52 -08:00 |
Brian Behlendorf
|
f3e6ac6dc9
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 15:09:00 -08:00 |
Brian Behlendorf
|
a7b2b73c73
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 15:08:54 -08:00 |
Brian Behlendorf
|
faf6c753bd
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 15:07:33 -08:00 |
Brian Behlendorf
|
2e7dffd82a
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 15:07: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
|
3ce8541e83
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:06:41 -08:00 |
Brian Behlendorf
|
d145044d80
|
Refresh Makefile
|
2008-12-12 15:04:48 -08:00 |
Brian Behlendorf
|
d1837164f8
|
Refresh autogen products
|
2008-12-12 14:58:35 -08:00 |