Brian Behlendorf
|
1b6bc0866d
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-14 13:32:40 -08:00 |
|
Brian Behlendorf
|
b874e980f9
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-14 13:32:39 -08:00 |
|
Brian Behlendorf
|
c0edd1f948
|
Remove unneeded header
|
2009-01-14 13:30:32 -08:00 |
|
Brian Behlendorf
|
926ec0657d
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-14 08:42:21 -08:00 |
|
Brian Behlendorf
|
04443d2d7a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-14 08:42:19 -08:00 |
|
Brian Behlendorf
|
f63f4dd2cd
|
Remove unneeded chunk, create a FS the real way with an ioctl
|
2009-01-14 08:26:09 -08:00 |
|
Brian Behlendorf
|
ef9e51e506
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-13 16:08:03 -08:00 |
|
Brian Behlendorf
|
97f656ab18
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-13 16:08:02 -08:00 |
|
Brian Behlendorf
|
fce0143a40
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 16:07:45 -08:00 |
|
Brian Behlendorf
|
04d7ae5f22
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 16:06:28 -08:00 |
|
Brian Behlendorf
|
c186f81c6d
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 16:06:26 -08:00 |
|
Brian Behlendorf
|
e1632568f1
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-13 16:06:23 -08:00 |
|
Brian Behlendorf
|
be0b4029db
|
Initialize list links
|
2009-01-13 16:02:19 -08:00 |
|
Brian Behlendorf
|
d92517e2a1
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-13 15:34:46 -08:00 |
|
Brian Behlendorf
|
9cccf52448
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-13 15:34:46 -08:00 |
|
Brian Behlendorf
|
c3335290e2
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 15:34:38 -08:00 |
|
Brian Behlendorf
|
32baeb1712
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 15:34:01 -08:00 |
|
Brian Behlendorf
|
0d6b81fcca
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 15:34:00 -08:00 |
|
Brian Behlendorf
|
43cd437415
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-13 15:33:59 -08:00 |
|
Brian Behlendorf
|
94944fab96
|
Fix proper list node initialization
|
2009-01-13 15:31:58 -08:00 |
|
Brian Behlendorf
|
5691cd6443
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-13 15:07:53 -08:00 |
|
Brian Behlendorf
|
f661985075
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-13 15:07:52 -08:00 |
|
Brian Behlendorf
|
925ed2c7a0
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 15:07:44 -08:00 |
|
Brian Behlendorf
|
b14513e826
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 15:07:08 -08:00 |
|
Brian Behlendorf
|
4c31283afc
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 15:07:07 -08:00 |
|
Brian Behlendorf
|
2e9cd667d0
|
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
|
2009-01-13 15:07:06 -08:00 |
|
Brian Behlendorf
|
fcd2296399
|
Additional rw_lock not being initialized cleaned in updated code
|
2009-01-13 15:05:02 -08:00 |
|
Brian Behlendorf
|
28d3375587
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-13 15:02:58 -08:00 |
|
Brian Behlendorf
|
3486f62c97
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-13 15:02:57 -08:00 |
|
Brian Behlendorf
|
042deede25
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 15:02:49 -08:00 |
|
Brian Behlendorf
|
60f5ac8ac7
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 15:02:12 -08:00 |
|
Brian Behlendorf
|
4a5bd7a3a8
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 15:02:11 -08:00 |
|
Brian Behlendorf
|
6c96fc31e9
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-13 15:02:10 -08:00 |
|
Brian Behlendorf
|
bec036636e
|
List cleanup and use of list_node_init initializer
|
2009-01-13 15:00:12 -08:00 |
|
Brian Behlendorf
|
b935807a03
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-13 14:18:58 -08:00 |
|
Brian Behlendorf
|
95b289e62b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-13 14:18:58 -08:00 |
|
Brian Behlendorf
|
b289f6dd98
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 14:18:50 -08:00 |
|
Brian Behlendorf
|
bdb0ce1a0d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 14:18:11 -08:00 |
|
Brian Behlendorf
|
552c9e1abb
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 14:18:10 -08:00 |
|
Brian Behlendorf
|
c6f1eca44b
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-13 14:18:09 -08:00 |
|
Brian Behlendorf
|
2ea04834bf
|
Remove assertion for now
|
2009-01-13 14:16:11 -08:00 |
|
Brian Behlendorf
|
4b655d95db
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-13 13:33:17 -08:00 |
|
Brian Behlendorf
|
a5643b08c3
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-13 13:33:16 -08:00 |
|
Brian Behlendorf
|
935c8157f9
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 13:33:09 -08:00 |
|
Brian Behlendorf
|
f8b66dcc4f
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 13:32:31 -08:00 |
|
Brian Behlendorf
|
8ad629750e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-13 13:32:30 -08:00 |
|
Brian Behlendorf
|
bb9b10a830
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-13 13:32:29 -08:00 |
|
Brian Behlendorf
|
b73b29ab8e
|
Fix c90 issue with { }
|
2009-01-13 13:30:35 -08:00 |
|
Brian Behlendorf
|
1481a4a7df
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-13 12:32:19 -08:00 |
|
Brian Behlendorf
|
d07009d2f7
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-13 12:32:18 -08:00 |
|
Brian Behlendorf
|
5a36a4b40b
|
Pull in needed hunk from old patch stack for a ZFS build without the ZPL support
|
2009-01-13 12:28:26 -08:00 |
|
Brian Behlendorf
|
0093e81879
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 16:54:05 -08:00 |
|
Brian Behlendorf
|
ca328c5d30
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 16:54:04 -08:00 |
|
Brian Behlendorf
|
3977cefecc
|
Update load/unload message, mknod /dev/zfs when udev is unavailable
|
2009-01-09 16:50:28 -08:00 |
|
Brian Behlendorf
|
3122996061
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 16:42:02 -08:00 |
|
Brian Behlendorf
|
d6e2f4a455
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 16:42:01 -08:00 |
|
Brian Behlendorf
|
7001fd57fa
|
Register sensible init/fini hooks
|
2009-01-09 16:38:13 -08:00 |
|
Brian Behlendorf
|
91f6492ef5
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 16:32:26 -08:00 |
|
Brian Behlendorf
|
4530d592f8
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 16:32:24 -08:00 |
|
Brian Behlendorf
|
d9a45283ce
|
Add ZFS load/unload console messages
|
2009-01-09 16:28:26 -08:00 |
|
Brian Behlendorf
|
c0f45a99fc
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 15:52:08 -08:00 |
|
Brian Behlendorf
|
3f70ee0f8a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 15:52:07 -08:00 |
|
Brian Behlendorf
|
1dc5e6d02e
|
Remove HAVE_SPL should be HAVE_ZPL
|
2009-01-09 15:50:00 -08:00 |
|
Brian Behlendorf
|
c766077d8c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 14:45:52 -08:00 |
|
Brian Behlendorf
|
3f48c3fcd5
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 14:45:52 -08:00 |
|
Brian Behlendorf
|
be3a17e437
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 14:45:45 -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
|
36eeb5eeb2
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 14:18:34 -08:00 |
|
Brian Behlendorf
|
b55164f2cb
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 14:18:33 -08:00 |
|
Brian Behlendorf
|
03a4aefbcf
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 14:18:25 -08:00 |
|
Brian Behlendorf
|
6b32aaea67
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-09 14:17:49 -08:00 |
|
Brian Behlendorf
|
86eb46d20b
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-09 14:17:49 -08:00 |
|
Brian Behlendorf
|
578c9645df
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-09 14:17:48 -08:00 |
|
Brian Behlendorf
|
902ce659b0
|
Fix c90 compliance issue
|
2009-01-09 14:15:56 -08:00 |
|
Brian Behlendorf
|
6a2d852b35
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 13:33:56 -08:00 |
|
Brian Behlendorf
|
c7b309f9b1
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 13:33:55 -08:00 |
|
Brian Behlendorf
|
bc5e2d8660
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 13:33:48 -08:00 |
|
Brian Behlendorf
|
7a7a074d3d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-09 13:33:11 -08:00 |
|
Brian Behlendorf
|
cd5e331e68
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-09 13:33:10 -08:00 |
|
Brian Behlendorf
|
953d302b87
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2009-01-09 13:33:09 -08:00 |
|
Brian Behlendorf
|
04638ead67
|
Change zpool module name to zfs and update references
|
2009-01-09 13:31:16 -08:00 |
|
Brian Behlendorf
|
ca4fc6ef63
|
Fix cast
|
2009-01-09 13:29:41 -08:00 |
|
Brian Behlendorf
|
68585e71a8
|
Get correct exit prototype
|
2009-01-09 13:28:42 -08:00 |
|
Brian Behlendorf
|
6e62e110c3
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 12:48:35 -08:00 |
|
Brian Behlendorf
|
9199436355
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 12:48:34 -08:00 |
|
Brian Behlendorf
|
18f3ecb485
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 12:48:17 -08:00 |
|
Brian Behlendorf
|
129afe3ce8
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-09 12:46:44 -08:00 |
|
Brian Behlendorf
|
b4d27767d8
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-09 12:46:42 -08:00 |
|
Brian Behlendorf
|
b3064162aa
|
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
|
2009-01-09 12:46:40 -08:00 |
|
Brian Behlendorf
|
cb5fc9440b
|
Remove extra defaults
|
2009-01-09 12:42:27 -08:00 |
|
Brian Behlendorf
|
a18eb3cc93
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 11:44:43 -08:00 |
|
Brian Behlendorf
|
2735cd4ab1
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 11:44:43 -08:00 |
|
Brian Behlendorf
|
f0f1f7362d
|
Remove invalid tunable
|
2009-01-09 11:42:31 -08:00 |
|
Brian Behlendorf
|
a4df8635db
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 11:31:48 -08:00 |
|
Brian Behlendorf
|
ab0e08c058
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 11:31:47 -08:00 |
|
Brian Behlendorf
|
dd50143ea1
|
Add module load/unload entry point hooks and ioctl integration
|
2009-01-09 11:21:59 -08:00 |
|
Brian Behlendorf
|
62ce4aabc6
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 09:22:33 -08:00 |
|
Brian Behlendorf
|
47f49e3634
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 09:22:33 -08:00 |
|
Brian Behlendorf
|
ed92da1e4e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 09:22:24 -08:00 |
|
Brian Behlendorf
|
91b9bf3f40
|
Pulling zvol, zfs_vfsops, and zfs_ioctl to resolve those build issues
|
2009-01-09 09:19:33 -08:00 |
|
Brian Behlendorf
|
1b6dee2506
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-07 15:52:40 -08:00 |
|
Brian Behlendorf
|
fdc9b1d377
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-07 15:52:39 -08:00 |
|
Brian Behlendorf
|
53a6418874
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-07 15:52:31 -08:00 |
|
Brian Behlendorf
|
2a76f03369
|
Update distfiles
|
2009-01-07 15:49:36 -08:00 |
|
Brian Behlendorf
|
f30cedbaf3
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-06 13:46:09 -08:00 |
|
Brian Behlendorf
|
1420cd5581
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-06 13:46:09 -08:00 |
|
Brian Behlendorf
|
f01d7c3dba
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-06 13:46:02 -08:00 |
|
Brian Behlendorf
|
6280843d13
|
Remove until it can be updated
|
2009-01-06 13:43:53 -08:00 |
|
Brian Behlendorf
|
09a5a916ec
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-06 13:16:49 -08:00 |
|
Brian Behlendorf
|
0e16147946
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-06 13:16:49 -08:00 |
|
Brian Behlendorf
|
74bff69746
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-06 13:16:42 -08:00 |
|
Brian Behlendorf
|
f9494f2bb1
|
Build missing sources
|
2009-01-06 13:14:30 -08:00 |
|
Brian Behlendorf
|
b9b559258c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-06 13:01:38 -08:00 |
|
Brian Behlendorf
|
6842512863
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-06 13:01:37 -08:00 |
|
Brian Behlendorf
|
57aad95a52
|
Refresh exported symbols
|
2009-01-06 12:59:50 -08:00 |
|
Brian Behlendorf
|
461db1ecc9
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-06 09:40:31 -08:00 |
|
Brian Behlendorf
|
889a81fcf2
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-06 09:40:30 -08:00 |
|
Brian Behlendorf
|
da647d38a3
|
Refresh exported symbols, remove zio_resume_threads as out of date
|
2009-01-06 09:38:39 -08:00 |
|
Brian Behlendorf
|
ac63920b2c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-06 09:30:36 -08:00 |
|
Brian Behlendorf
|
abca9d8b9a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-06 09:30:36 -08:00 |
|
Brian Behlendorf
|
bc820e95a6
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-06 09:30:29 -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
|
f6f3c46840
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-06 09:16:17 -08:00 |
|
Brian Behlendorf
|
e4a4ad147a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-06 09:16:16 -08:00 |
|
Brian Behlendorf
|
d71643eb94
|
Refresh exported symbols
|
2009-01-06 09:14:10 -08:00 |
|
Brian Behlendorf
|
43e4426b34
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-06 09:03:52 -08:00 |
|
Brian Behlendorf
|
b521002205
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-06 09:03:51 -08:00 |
|
Brian Behlendorf
|
1c496f0235
|
Refresh exported spa_config symbols
|
2009-01-06 08:59:36 -08:00 |
|
Brian Behlendorf
|
3edbae3a2d
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 16:59:20 -08:00 |
|
Brian Behlendorf
|
7feda9d67d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 16:59:18 -08:00 |
|
Brian Behlendorf
|
90ff526841
|
Remove symbol exports no longer needed with the dsl scrub rewrite
|
2009-01-05 16:55:15 -08:00 |
|
Brian Behlendorf
|
4f8a8bc8da
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 16:39:44 -08:00 |
|
Brian Behlendorf
|
7b1eb5d131
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 16:39:42 -08:00 |
|
Brian Behlendorf
|
d763974558
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 16:39:26 -08:00 |
|
Brian Behlendorf
|
9d4d588938
|
Comment out until ZPL implemented
|
2009-01-05 16:34:01 -08:00 |
|
Brian Behlendorf
|
2800480736
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 16:00:42 -08:00 |
|
Brian Behlendorf
|
867b188b30
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 16:00:41 -08:00 |
|
Brian Behlendorf
|
76d40e2e81
|
Update exported symbols
|
2009-01-05 15:58:50 -08:00 |
|
Brian Behlendorf
|
a9c201e00f
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 15:45:13 -08:00 |
|
Brian Behlendorf
|
ef0cd2992f
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 15:45:12 -08:00 |
|
Brian Behlendorf
|
b2db87f254
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 15:45:05 -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
|
bb4ca885b5
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 15:21:19 -08:00 |
|
Brian Behlendorf
|
5b2b7fc3df
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 15:21:19 -08:00 |
|
Brian Behlendorf
|
eb58273a29
|
Update exported symbol names for new traversal code
|
2009-01-05 15:19:35 -08:00 |
|
Brian Behlendorf
|
74245215c4
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 14:28:40 -08:00 |
|
Brian Behlendorf
|
d1c8781815
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 14:28:39 -08:00 |
|
Brian Behlendorf
|
ec462ce48f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 14:28:33 -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
|
1751caa615
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 12:40:38 -08:00 |
|
Brian Behlendorf
|
5d49f45c50
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 12:40:37 -08:00 |
|
Brian Behlendorf
|
9c2bf69ecb
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 12:40:25 -08:00 |
|
Brian Behlendorf
|
ce7115b807
|
Add unicode makefile references and support
|
2009-01-05 12:33:09 -08:00 |
|
Brian Behlendorf
|
0a963fa1b8
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-23 13:49:54 -08:00 |
|
Brian Behlendorf
|
6b88c17a8f
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-23 13:49:54 -08:00 |
|
Brian Behlendorf
|
39953e7eb3
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-23 13:49:47 -08:00 |
|
Brian Behlendorf
|
ffb8773241
|
Take out page map functions for now
|
2008-12-23 13:47:22 -08:00 |
|
Brian Behlendorf
|
de6b729e33
|
Add Makefile tweak
|
2008-12-23 13:44:15 -08:00 |
|
Brian Behlendorf
|
4177b4715d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-23 13:13:37 -08:00 |
|
Brian Behlendorf
|
642a64b7bd
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-23 13:13:37 -08:00 |
|
Brian Behlendorf
|
7725fe7431
|
Remove CPU_SEQID from context, available in SPL. Additionally add module magic for zcommon
|
2008-12-23 13:11:03 -08:00 |
|
Brian Behlendorf
|
1431c8e452
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-23 11:50:06 -08:00 |
|
Brian Behlendorf
|
8209bef3af
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-23 11:50:05 -08:00 |
|
Brian Behlendorf
|
82cd3659a2
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-23 11:49:58 -08:00 |
|
Brian Behlendorf
|
5a0a9cc451
|
Update makefiles
|
2008-12-23 11:47:33 -08:00 |
|
Brian Behlendorf
|
8f69262e09
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 13:52:06 -08:00 |
|
Brian Behlendorf
|
c93aec7f64
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 13:52:05 -08:00 |
|
Brian Behlendorf
|
1f72057409
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 13:51: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
|
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
|
a9058c38b3
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 13:35:07 -08:00 |
|
Brian Behlendorf
|
9bfe4e627a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 13:35:06 -08:00 |
|
Brian Behlendorf
|
46badfb03b
|
Only allow this for the kernel
|
2008-12-22 13:33:06 -08:00 |
|
Brian Behlendorf
|
b49ce65660
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 11:41:35 -08:00 |
|
Brian Behlendorf
|
fa9a05e496
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 11:41:35 -08:00 |
|
Brian Behlendorf
|
187be3051e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 11:41:27 -08:00 |
|
Brian Behlendorf
|
7047bb0678
|
Add missing files from Makefile.am
|
2008-12-22 11:36:48 -08:00 |
|
Brian Behlendorf
|
72f9288f09
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 11:08:24 -08:00 |
|
Brian Behlendorf
|
d51e1b0eeb
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 11:08:23 -08:00 |
|
Brian Behlendorf
|
09de417e20
|
Move #endif up to expose userspace bits
|
2008-12-22 11:01:35 -08:00 |
|
Brian Behlendorf
|
ba2c349faf
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 10:36:56 -08:00 |
|
Brian Behlendorf
|
e0141c82aa
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 10:36:55 -08:00 |
|
Brian Behlendorf
|
bdbd91fe46
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 10:36:48 -08:00 |
|
Brian Behlendorf
|
10911f9d71
|
Add missing sources
|
2008-12-22 10:27:41 -08:00 |
|
Brian Behlendorf
|
07bc9c667e
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 16:34:28 -08:00 |
|
Brian Behlendorf
|
f7b6b1c5c1
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 16:34:27 -08:00 |
|
Brian Behlendorf
|
cbc70456f1
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 16:34:10 -08:00 |
|
Brian Behlendorf
|
96813619bf
|
Pull in new background scrubber
|
2008-12-19 16:29:13 -08:00 |
|
Brian Behlendorf
|
f935667824
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 13:48:01 -08:00 |
|
Brian Behlendorf
|
5ae92c2a3c
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 13:48:00 -08:00 |
|
Brian Behlendorf
|
5cd3d5fe3f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 13:47:53 -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 |
|
Brian Behlendorf
|
89bd2100e7
|
Resolve a few more c90 issues
|
2008-12-19 13:45:24 -08:00 |
|
Brian Behlendorf
|
d6bcad3544
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 12:38:40 -08:00 |
|
Brian Behlendorf
|
f53179120a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 12:38:39 -08:00 |
|
Brian Behlendorf
|
5f5a7707b5
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 12:38:25 -08:00 |
|
Brian Behlendorf
|
97818e5e2b
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 12:37:17 -08:00 |
|
Brian Behlendorf
|
459f1388ba
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 12:37:15 -08:00 |
|
Brian Behlendorf
|
87810a7c8b
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 12:37:13 -08:00 |
|
Brian Behlendorf
|
93a6c0b0b9
|
Fix c90 for() issue
|
2008-12-19 12:33:22 -08:00 |
|
Brian Behlendorf
|
d5b0e2f5f8
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 11:06:33 -08:00 |
|
Brian Behlendorf
|
f9e908db67
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 11:06:32 -08:00 |
|
Brian Behlendorf
|
e5a6ed971b
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 11:06:25 -08:00 |
|
Brian Behlendorf
|
cc92d6497b
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 11:05:49 -08:00 |
|
Brian Behlendorf
|
d67cf69e08
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 11:05:49 -08:00 |
|
Brian Behlendorf
|
893a49fa9a
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 11:05:48 -08:00 |
|
Brian Behlendorf
|
9041f66bad
|
Fix all instances of for (int i;;) {} that were easily found
|
2008-12-19 11:03:54 -08:00 |
|
Brian Behlendorf
|
38712a11db
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 10:50:50 -08:00 |
|
Brian Behlendorf
|
25585a1884
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 10:50:49 -08:00 |
|
Brian Behlendorf
|
4f5a560334
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 10:50:42 -08:00 |
|
Brian Behlendorf
|
1db27e736e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 10:50:09 -08:00 |
|
Brian Behlendorf
|
ead0ea6da5
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 10:50:09 -08:00 |
|
Brian Behlendorf
|
d9b08ad01f
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 10:50:08 -08:00 |
|
Brian Behlendorf
|
66e0d59024
|
Whoops, add missing j
|
2008-12-19 10:48:11 -08:00 |
|
Brian Behlendorf
|
7532b57352
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 10:37:14 -08:00 |
|
Brian Behlendorf
|
fd01bfe6b1
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 10:37:13 -08:00 |
|
Brian Behlendorf
|
01f8dc1f20
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 10:37:06 -08:00 |
|
Brian Behlendorf
|
76247cc21d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 10:36:34 -08:00 |
|
Brian Behlendorf
|
800463b2ef
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 10:36:33 -08:00 |
|
Brian Behlendorf
|
7e159c86a3
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 10:36:32 -08:00 |
|
Brian Behlendorf
|
294ebb7537
|
Fix C90 for(int i;;;) compliance issues
|
2008-12-19 10:34:41 -08:00 |
|
Brian Behlendorf
|
8985e2430d
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 10:26:57 -08:00 |
|
Brian Behlendorf
|
4ee870c380
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 10:26:57 -08:00 |
|
Brian Behlendorf
|
f1ba2464f9
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 10:26:50 -08:00 |
|
Brian Behlendorf
|
e3815b6d3f
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 10:26:18 -08:00 |
|
Brian Behlendorf
|
e312737766
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 10:26:18 -08:00 |
|
Brian Behlendorf
|
b66929fe90
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-19 10:26:17 -08:00 |
|
Brian Behlendorf
|
5ee6377759
|
Fix missing void in prototype
|
2008-12-19 10:24:26 -08:00 |
|
Brian Behlendorf
|
f4f6b1f529
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-18 13:53:09 -08:00 |
|
Brian Behlendorf
|
ecb1da0ac8
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-18 13:53:08 -08:00 |
|
Brian Behlendorf
|
ef0739a21d
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 13:52:59 -08:00 |
|
Brian Behlendorf
|
433b5c8023
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 13:52:17 -08:00 |
|
Brian Behlendorf
|
93bc33a39e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-18 13:52:16 -08:00 |
|
Brian Behlendorf
|
23e30eeec9
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-18 13:52:15 -08:00 |
|
Brian Behlendorf
|
6cccf01d35
|
Missed needed drc var
|
2008-12-18 13:50:12 -08:00 |
|
Brian Behlendorf
|
c513e66884
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-18 13:44:06 -08:00 |
|
Brian Behlendorf
|
360d4841e7
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-18 13:44:05 -08:00 |
|
Brian Behlendorf
|
07901e75cc
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 13:43:58 -08:00 |
|
Brian Behlendorf
|
bab7f42832
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 13:43:20 -08:00 |
|
Brian Behlendorf
|
5ce7826ab4
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-18 13:43:19 -08:00 |
|
Brian Behlendorf
|
732fe6a75f
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-18 13:43:19 -08:00 |
|
Brian Behlendorf
|
973a9d5a79
|
Resolve drr shadow by breaking hunk in to a new function, which is just cleaner anyway
|
2008-12-18 13:41:21 -08:00 |
|
Brian Behlendorf
|
a3cbac5278
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-18 13:27:23 -08:00 |