Brian Behlendorf
|
830ac5b109
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-02-18 15:20:11 -08:00 |
|
Brian Behlendorf
|
6f8f3b5532
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-02-18 15:20:10 -08:00 |
|
Brian Behlendorf
|
9d4d22a26e
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2009-02-18 15:20:08 -08:00 |
|
Brian Behlendorf
|
8c228734a3
|
Fix cast
|
2009-02-18 15:15:56 -08:00 |
|
Brian Behlendorf
|
bf75e042f9
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-02-18 14:37:31 -08:00 |
|
Brian Behlendorf
|
7872d84be6
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-02-18 14:30:54 -08:00 |
|
Brian Behlendorf
|
6fe19bd252
|
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
Conflicts:
lib/libzpool/kernel.c
module/zfs/arc.c
|
2009-02-18 14:28:15 -08:00 |
|
Brian Behlendorf
|
f0a8aedfbc
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
Conflicts:
lib/libzpool/kernel.c
module/zfs/arc.c
|
2009-02-18 14:27:12 -08:00 |
|
Brian Behlendorf
|
5be9e325a1
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
Conflicts:
module/zfs/arc.c
|
2009-02-18 14:03:22 -08:00 |
|
Brian Behlendorf
|
ba528721da
|
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
|
2009-02-18 13:12:58 -08:00 |
|
Brian Behlendorf
|
0b8e48b813
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2009-02-18 13:12:53 -08:00 |
|
Brian Behlendorf
|
e203e7b48f
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2009-02-18 13:12:35 -08:00 |
|
Brian Behlendorf
|
f686a87058
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Conflicts:
module/zfs/arc.c
|
2009-02-18 13:12:26 -08:00 |
|
Brian Behlendorf
|
3b17164f71
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Conflicts:
module/zfs/vdev.c
module/zfs/zio.c
|
2009-02-18 13:09:32 -08:00 |
|
Brian Behlendorf
|
d164b20935
|
Rebase master to b108
|
2009-02-18 12:51:31 -08:00 |
|
Brian Behlendorf
|
ca8bcb2496
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-15 14:22:07 -08:00 |
|
Brian Behlendorf
|
ddaad20220
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-15 14:16:23 -08:00 |
|
Brian Behlendorf
|
551838a6c8
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:13:39 -08:00 |
|
Brian Behlendorf
|
da7151a89e
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:11:19 -08:00 |
|
Brian Behlendorf
|
977fef2ba7
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2009-01-15 14:05:32 -08:00 |
|
Brian Behlendorf
|
2f36bf5af4
|
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
|
2009-01-15 14:05:29 -08:00 |
|
Brian Behlendorf
|
35a269c06c
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2009-01-15 14:05:26 -08:00 |
|
Brian Behlendorf
|
a2e601c6e3
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2009-01-15 14:04:39 -08:00 |
|
Brian Behlendorf
|
3fa768e21b
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:04:35 -08:00 |
|
Brian Behlendorf
|
d3df6b2012
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2009-01-15 14:01:51 -08:00 |
|
Brian Behlendorf
|
fb5f0bc833
|
Rebase master to b105
|
2009-01-15 13:59:39 -08:00 |
|
Brian Behlendorf
|
3a9ed52a6c
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-09 15:11:52 -08:00 |
|
Brian Behlendorf
|
6791a1ee34
|
I don't think we need this in userspace
|
2009-01-09 15:07:32 -08:00 |
|
Brian Behlendorf
|
ae80ba7fda
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-09 14:46:36 -08:00 |
|
Brian Behlendorf
|
ff09d64647
|
Pull all source in to be built, it will be ifdef'ed out as need by higher level topic branches
|
2009-01-09 14:37:45 -08:00 |
|
Brian Behlendorf
|
b7ba234fcc
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-08 10:29:18 -08:00 |
|
Brian Behlendorf
|
b457fb49f9
|
Remove vdev_disk from userspace build, vdev_file is used
|
2009-01-08 10:23:59 -08:00 |
|
Brian Behlendorf
|
b22496960e
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-05 13:47:24 -08:00 |
|
Brian Behlendorf
|
c15fa0ceb0
|
Add include paths
|
2009-01-05 13:44:26 -08:00 |
|
Brian Behlendorf
|
13e4ebb0b3
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-05 12:45:29 -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
|
01dd722b45
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-22 14:45:38 -08:00 |
|
Brian Behlendorf
|
29b47d366e
|
Remove some headers
|
2008-12-22 14:42:02 -08:00 |
|
Brian Behlendorf
|
617556ddde
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-22 13:52:57 -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
|
035e4d373e
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-22 13:51:16 -08:00 |
|
Brian Behlendorf
|
c9597f9a4f
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-22 13:51:15 -08:00 |
|
Brian Behlendorf
|
6bed331e59
|
More compat changes
|
2008-12-22 13:47:58 -08:00 |
|
Brian Behlendorf
|
46ee012365
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-22 12:55:01 -08:00 |
|
Brian Behlendorf
|
121effcbee
|
Pull everything in to the Makefile
|
2008-12-22 12:51:03 -08:00 |
|
Brian Behlendorf
|
0cf01a7c69
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-22 11:42:28 -08:00 |
|
Brian Behlendorf
|
7047bb0678
|
Add missing files from Makefile.am
|
2008-12-22 11:36:48 -08:00 |
|
Brian Behlendorf
|
735f99cbcb
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-22 10:37:47 -08:00 |
|
Brian Behlendorf
|
10911f9d71
|
Add missing sources
|
2008-12-22 10:27:41 -08:00 |
|
Brian Behlendorf
|
9ce20e962a
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-19 16:57:50 -08:00 |
|
Brian Behlendorf
|
60289ccd8f
|
Add zfs_byteswap
|
2008-12-19 16:51:14 -08:00 |
|
Brian Behlendorf
|
a89736c72e
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-19 16:36:09 -08:00 |
|
Brian Behlendorf
|
96813619bf
|
Pull in new background scrubber
|
2008-12-19 16:29:13 -08:00 |
|
Brian Behlendorf
|
1f2ec6b6cd
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-19 13:38:51 -08:00 |
|
Brian Behlendorf
|
8ab575cd8e
|
Remove vdev_disk.c from userspace build, we simply use vdev_file.c here
|
2008-12-19 13:35:29 -08:00 |
|
Brian Behlendorf
|
3c787f200f
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-19 12:11:19 -08:00 |
|
Brian Behlendorf
|
e485017676
|
Remove spa_boot from userspace build
|
2008-12-19 12:04:45 -08:00 |
|
Brian Behlendorf
|
347283843e
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-19 10:19:58 -08:00 |
|
Brian Behlendorf
|
9de4108779
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 10:18:12 -08:00 |
|
Brian Behlendorf
|
3e2e5c4535
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-19 10:18:12 -08:00 |
|
Brian Behlendorf
|
a68af79057
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-19 10:18:11 -08:00 |
|
Brian Behlendorf
|
d4c39af7a6
|
Re-add KM_PUSHPAGE
|
2008-12-19 10:15:52 -08:00 |
|
Brian Behlendorf
|
330840ff2e
|
Re-add KM_PUSHPAGE
|
2008-12-19 10:15:27 -08:00 |
|
Brian Behlendorf
|
3845f85e42
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-19 09:54:48 -08:00 |
|
Brian Behlendorf
|
2d0ae2710c
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 09:52:53 -08:00 |
|
Brian Behlendorf
|
5906903384
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-19 09:52:52 -08:00 |
|
Brian Behlendorf
|
3d8832a795
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-19 09:52:51 -08:00 |
|
Brian Behlendorf
|
3bc48c3e74
|
Missing func readd
|
2008-12-19 09:50:15 -08:00 |
|
Brian Behlendorf
|
111303eeb8
|
context
|
2008-12-19 09:47:09 -08:00 |
|
Brian Behlendorf
|
dbc567603d
|
Readd removed hunk
|
2008-12-19 09:39:17 -08:00 |
|
Brian Behlendorf
|
3d19534f7a
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-18 13:20:09 -08:00 |
|
Brian Behlendorf
|
72bf32a79f
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 13:18:19 -08:00 |
|
Brian Behlendorf
|
844a9ced6d
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-18 13:18:17 -08:00 |
|
Brian Behlendorf
|
33e499be43
|
Merge branch 'fix-stack' into refs/top-bases/fix-branch
|
2008-12-18 13:18:15 -08:00 |
|
Brian Behlendorf
|
8e136cf0c9
|
Add noinline macro for userspace
|
2008-12-18 13:15:58 -08:00 |
|
Brian Behlendorf
|
00aa17c6b3
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-18 10:03:20 -08:00 |
|
Brian Behlendorf
|
0a353443cd
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 10:01:41 -08:00 |
|
Brian Behlendorf
|
9c0846462b
|
Resolve conflict
|
2008-12-18 10:01:37 -08:00 |
|
Brian Behlendorf
|
4df7b421a1
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-18 10:00:46 -08:00 |
|
Brian Behlendorf
|
25a3fca866
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-18 10:00:45 -08:00 |
|
Brian Behlendorf
|
9e195d0cbf
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-18 10:00:44 -08:00 |
|
Brian Behlendorf
|
c8f253cda8
|
Now fixed in fix-pthreads branch
|
2008-12-18 09:58:42 -08:00 |
|
Brian Behlendorf
|
229aba2943
|
Properly cast thread functions for pthreads
|
2008-12-18 09:56:22 -08:00 |
|
Brian Behlendorf
|
893ed2fad0
|
Properly cast thread functions for pthreads
|
2008-12-18 09:56:05 -08:00 |
|
Brian Behlendorf
|
f4d63a4cd4
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-17 16:47:26 -08:00 |
|
Brian Behlendorf
|
f799177730
|
Add all sources for libzfs userspace funcationality
|
2008-12-17 16:39:45 -08:00 |
|
Brian Behlendorf
|
b355788b7b
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-17 13:38:43 -08:00 |
|
Brian Behlendorf
|
ba3d5afa54
|
Add missing \
|
2008-12-17 13:35:06 -08:00 |
|
Brian Behlendorf
|
eebeedfaff
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-17 11:37:52 -08:00 |
|
Brian Behlendorf
|
5ea99efac7
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 11:36:20 -08:00 |
|
Brian Behlendorf
|
676ab35598
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-17 11:36:19 -08:00 |
|
Brian Behlendorf
|
0106dabb11
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-17 11:36:18 -08:00 |
|
Brian Behlendorf
|
a681d70e28
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 11:36:17 -08:00 |
|
Brian Behlendorf
|
e532f6bef4
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 11:36:16 -08:00 |
|
Brian Behlendorf
|
8af904a4b0
|
Resolve index shadowing /usr/include/string.h:304
|
2008-12-17 11:34:19 -08:00 |
|
Brian Behlendorf
|
ed9a35324d
|
Not sure why Sun needed to remove these externs, but I need them back
|
2008-12-17 11:32:47 -08:00 |
|
Brian Behlendorf
|
9e2f2bb378
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-17 11:28:51 -08:00 |
|
Brian Behlendorf
|
25db7e9413
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 11:27:21 -08:00 |
|
Brian Behlendorf
|
935fd6c681
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 11:27:20 -08:00 |