Brian Behlendorf
|
29ca9904a1
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-06 13:46:18 -08:00 |
|
Brian Behlendorf
|
6280843d13
|
Remove until it can be updated
|
2009-01-06 13:43:53 -08:00 |
|
Brian Behlendorf
|
446470c90a
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-06 13:16:58 -08:00 |
|
Brian Behlendorf
|
f9494f2bb1
|
Build missing sources
|
2009-01-06 13:14:30 -08:00 |
|
Brian Behlendorf
|
7d73a17e54
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-06 09:30:45 -08:00 |
|
Brian Behlendorf
|
5f9b0590f5
|
Remove zfs_fuid for now from kernel source until needed by ZPL
|
2009-01-06 09:28:09 -08:00 |
|
Brian Behlendorf
|
8c5d486797
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-05 16:40:03 -08:00 |
|
Brian Behlendorf
|
9d4d588938
|
Comment out until ZPL implemented
|
2009-01-05 16:34:01 -08:00 |
|
Brian Behlendorf
|
67c9f22507
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-05 15:45:21 -08:00 |
|
Brian Behlendorf
|
760d78b9f8
|
Move default include paths after custom include paths so local stuff gets picked up first
|
2009-01-05 15:42:56 -08:00 |
|
Brian Behlendorf
|
c31e0e9e89
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-05 14:28:49 -08:00 |
|
Brian Behlendorf
|
a4ecacdad7
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-05 14:28:00 -08:00 |
|
Brian Behlendorf
|
93e72d1102
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-05 14:27:59 -08:00 |
|
Brian Behlendorf
|
854fda6d70
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2009-01-05 14:27:58 -08:00 |
|
Brian Behlendorf
|
12ee6d57c8
|
Avoid using { 0 } assignment because it assume certain things about the condvar and mutex typedefs which may not be true
|
2009-01-05 14:26:16 -08:00 |
|
Brian Behlendorf
|
d5350109f4
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-05 12:40:55 -08:00 |
|
Brian Behlendorf
|
ce7115b807
|
Add unicode makefile references and support
|
2009-01-05 12:33:09 -08:00 |
|
Brian Behlendorf
|
ced77c2f1b
|
Add unicode makefile references and support
|
2009-01-05 12:32:55 -08:00 |
|
Brian Behlendorf
|
cd566dec4e
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-05 12:11:24 -08:00 |
|
Brian Behlendorf
|
07c6176130
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-05 12:09:06 -08:00 |
|
Brian Behlendorf
|
39b3a6a12d
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-05 12:08:11 -08:00 |
|
Brian Behlendorf
|
a22f3a712d
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2009-01-05 12:07:58 -08:00 |
|
Brian Behlendorf
|
7d4ccef58f
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-05 12:07:27 -08:00 |
|
Brian Behlendorf
|
cdfd10ba79
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2009-01-05 12:07:25 -08:00 |
|
Brian Behlendorf
|
42bcb36c89
|
Add unicode library
|
2009-01-05 12:03:23 -08:00 |
|
Brian Behlendorf
|
55dd786189
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-23 13:50:03 -08:00 |
|
Brian Behlendorf
|
de6b729e33
|
Add Makefile tweak
|
2008-12-23 13:44:15 -08:00 |
|
Brian Behlendorf
|
7539a5da86
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-23 13:13:46 -08:00 |
|
Brian Behlendorf
|
e7e0111a7c
|
Update makefile
|
2008-12-23 13:07:27 -08:00 |
|
Brian Behlendorf
|
ef8ca905d2
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-23 12:51:16 -08:00 |
|
Brian Behlendorf
|
0dfd5ebee8
|
module/zcommon/Makefile.in
|
2008-12-23 12:47:03 -08:00 |
|
Brian Behlendorf
|
5fe9881ef0
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-23 11:50:15 -08:00 |
|
Brian Behlendorf
|
5a0a9cc451
|
Update makefiles
|
2008-12-23 11:47:33 -08:00 |
|
Brian Behlendorf
|
b7217f525f
|
Fix typo
|
2008-12-22 14:52:15 -08:00 |
|
Brian Behlendorf
|
262e367cd5
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 13:52:16 -08:00 |
|
Brian Behlendorf
|
90e5216ea9
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 13:51:17 -08:00 |
|
Brian Behlendorf
|
3b93dc4d82
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 13:51:14 -08:00 |
|
Brian Behlendorf
|
3a953fa870
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-22 13:51:13 -08:00 |
|
Brian Behlendorf
|
d684390d3a
|
Just fix a bogus return type
|
2008-12-22 13:49:15 -08:00 |
|
Brian Behlendorf
|
2f4b12b228
|
Add HAVE_ZVOL changes
|
2008-12-22 12:37:43 -08:00 |
|
Brian Behlendorf
|
6d13a998fb
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 11:41:45 -08:00 |
|
Brian Behlendorf
|
7047bb0678
|
Add missing files from Makefile.am
|
2008-12-22 11:36:48 -08:00 |
|
Brian Behlendorf
|
5169758856
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 10:37:05 -08:00 |
|
Brian Behlendorf
|
10911f9d71
|
Add missing sources
|
2008-12-22 10:27:41 -08:00 |
|
Brian Behlendorf
|
6fdfd55847
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 16:34:48 -08:00 |
|
Brian Behlendorf
|
96813619bf
|
Pull in new background scrubber
|
2008-12-19 16:29:13 -08:00 |
|
Brian Behlendorf
|
99a14f150c
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 13:48:10 -08:00 |
|
Brian Behlendorf
|
1b2a1a31bb
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 13:47:20 -08:00 |
|
Brian Behlendorf
|
b5e4bf3731
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 13:47:19 -08:00 |
|
Brian Behlendorf
|
8161b781a1
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 13:47:18 -08:00 |