Brian Behlendorf
|
44b0019398
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-07 15:53:12 -08:00 |
Brian Behlendorf
|
2a76f03369
|
Update distfiles
|
2009-01-07 15:49:36 -08:00 |
Brian Behlendorf
|
e052f977cf
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-06 13:46:35 -08:00 |
Brian Behlendorf
|
6280843d13
|
Remove until it can be updated
|
2009-01-06 13:43:53 -08:00 |
Brian Behlendorf
|
f956f89e88
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-06 13:17:15 -08:00 |
Brian Behlendorf
|
f9494f2bb1
|
Build missing sources
|
2009-01-06 13:14:30 -08:00 |
Brian Behlendorf
|
802acd05cf
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-06 09:31:02 -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
|
834679e9d0
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-05 16:40:47 -08:00 |
Brian Behlendorf
|
9d4d588938
|
Comment out until ZPL implemented
|
2009-01-05 16:34:01 -08:00 |
Brian Behlendorf
|
d9fa727559
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-05 15:45:38 -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
|
a198620e23
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-05 14:29:06 -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
|
d51fb2c1d6
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-05 12:41:33 -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
|
e49cbb65ad
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-05 12:12:08 -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
|
900ccaf1c1
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-23 13:50:22 -08:00 |
Brian Behlendorf
|
de6b729e33
|
Add Makefile tweak
|
2008-12-23 13:44:15 -08:00 |
Brian Behlendorf
|
29636e23e8
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-23 13:14:04 -08:00 |
Brian Behlendorf
|
e7e0111a7c
|
Update makefile
|
2008-12-23 13:07:27 -08:00 |
Brian Behlendorf
|
650df8eda1
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-23 12:51:35 -08:00 |
Brian Behlendorf
|
0dfd5ebee8
|
module/zcommon/Makefile.in
|
2008-12-23 12:47:03 -08:00 |
Brian Behlendorf
|
6b2ced4447
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-23 11:50:33 -08:00 |
Brian Behlendorf
|
5a0a9cc451
|
Update makefiles
|
2008-12-23 11:47:33 -08:00 |
Brian Behlendorf
|
171df20083
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-22 13:52:37 -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
|
af113488c1
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-22 11:42:08 -08:00 |
Brian Behlendorf
|
7047bb0678
|
Add missing files from Makefile.am
|
2008-12-22 11:36:48 -08:00 |
Brian Behlendorf
|
1bfbc7e5ba
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-22 10:37:28 -08:00 |
Brian Behlendorf
|
10911f9d71
|
Add missing sources
|
2008-12-22 10:27:41 -08:00 |
Brian Behlendorf
|
29c4d604d3
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-19 16:35:36 -08:00 |
Brian Behlendorf
|
96813619bf
|
Pull in new background scrubber
|
2008-12-19 16:29:13 -08:00 |
Brian Behlendorf
|
0a18cf2a6e
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-19 13:48:31 -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 |