Brian Behlendorf
|
7c879f3b8b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-15 14:52:56 -08:00 |
|
Brian Behlendorf
|
141235d905
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-15 14:52:47 -08:00 |
|
Brian Behlendorf
|
63722ea81a
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-15 14:52:04 -08:00 |
|
Brian Behlendorf
|
12fb73609c
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-15 14:52:04 -08:00 |
|
Brian Behlendorf
|
e23dbee181
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-15 14:52:03 -08:00 |
|
Brian Behlendorf
|
b61295bfb6
|
Resolve C90 int declared in for() construct
|
2009-01-15 14:49:42 -08:00 |
|
Brian Behlendorf
|
dd2e5734f7
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-15 14:39:26 -08:00 |
|
Brian Behlendorf
|
4c1ba3d379
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-15 14:39:25 -08:00 |
|
Brian Behlendorf
|
1a4ae03863
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-15 14:39:18 -08:00 |
|
Brian Behlendorf
|
3b6c91ec9f
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-15 14:38:38 -08:00 |
|
Brian Behlendorf
|
ec41b57eb3
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-15 14:38:38 -08:00 |
|
Brian Behlendorf
|
e9c7a643f1
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-15 14:38:37 -08:00 |
|
Brian Behlendorf
|
77f365172c
|
Resolve C90 int declared in for() construct
|
2009-01-15 14:36:27 -08:00 |
|
Brian Behlendorf
|
574b2c897e
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-15 14:29:58 -08:00 |
|
Brian Behlendorf
|
372dba924d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-15 14:29:58 -08:00 |
|
Brian Behlendorf
|
ab52989424
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-15 14:29:50 -08:00 |
|
Brian Behlendorf
|
cb55f9a832
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-15 14:29:11 -08:00 |
|
Brian Behlendorf
|
43b4c537eb
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-15 14:29:10 -08:00 |
|
Brian Behlendorf
|
f969333c73
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-15 14:29:09 -08:00 |
|
Brian Behlendorf
|
c4fc002c87
|
Resolve C90 int declared in for() construct
|
2009-01-15 14:26:52 -08:00 |
|
Brian Behlendorf
|
924bc262cc
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-15 14:21:05 -08:00 |
|
Brian Behlendorf
|
ee1faab64d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-15 14:21:03 -08:00 |
|
Brian Behlendorf
|
091a4a4ca4
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:20:49 -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
|
089836c3e4
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:14:57 -08:00 |
|
Brian Behlendorf
|
551838a6c8
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:13:39 -08:00 |
|
Brian Behlendorf
|
b633e4f669
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2009-01-15 14:11:26 -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
|
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
|
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 |