149eea21db
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-09 10:39:49 -07:00
a8d32ac1e2
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-09 10:39:46 -07:00
e5e94c40f7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 10:39:44 -07:00
aa8ed32ee8
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 10:39:43 -07:00
9e394e10a9
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-07-09 10:39:41 -07:00
43af29de5f
Type int accidentally not declared at the top of the function.
2009-07-09 10:19:02 -07:00
4d410127b0
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-09 08:49:29 -07:00
cc6e67fa7f
Wrap sysevent includes until sysevent or something like it is implemented.
2009-07-09 08:40:33 -07:00
2aa22c1ccb
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-08 09:17:53 -07:00
1355255010
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-08 09:17:52 -07:00
affa4ec536
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-08 09:16:10 -07:00
aa636ae442
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-08 09:16:07 -07:00
33077ad631
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-08 09:16:05 -07:00
f00e6fe5c3
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-08 09:16:04 -07:00
5fc46112cb
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-07-08 09:16:01 -07:00
58f5e63293
Resolve a 2 new cases of for loop variable declared in for()
2009-07-08 09:05:37 -07:00
28718acdab
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-07 17:13:35 -07:00
756d013735
Disable autoexpand notifing sysevent which is not supported.
2009-07-07 17:06:27 -07:00
68a0ba0bc3
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-07 16:32:35 -07:00
deacdbc785
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-07 16:32:34 -07:00
67e2052f52
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-07 16:31:01 -07:00
b6cf87b32d
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-07 16:30:58 -07:00
0a00d10c24
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-07 16:30:57 -07:00
02362668ac
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-07 16:30:56 -07:00
24daf7747f
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-07-07 16:30:54 -07:00
0e310d30de
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-07-07 16:30:54 -07:00
10dcf485d3
First fit allocator unused comment it out.
2009-07-07 16:23:09 -07:00
ebda366c1c
Add missing case introduced by rebase.
2009-07-07 16:22:33 -07:00
f6880f590e
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-07 16:10:52 -07:00
77e4a2039c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-07 16:10:51 -07:00
e122a47cd8
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-07 16:09:19 -07:00
b8af4a2181
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-07 16:09:16 -07:00
c460e5edb0
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-07 16:09:15 -07:00
04a83f2337
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-07 16:09:13 -07:00
55b864f19b
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-07-07 16:09:12 -07:00
f80f59f955
Add missing paranthesis for gcc.
2009-07-07 16:01:13 -07:00
71a479fb53
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-07 15:51:59 -07:00
91316b77b9
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-07 15:51:57 -07:00
795d799358
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-07 15:50:19 -07:00
4abc33bbe4
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-07 15:50:16 -07:00
e5c8fcd6b0
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-07 15:50:14 -07:00
c75167c985
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-07 15:50:13 -07:00
07a6b68575
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-07-07 15:50:11 -07:00
7373ddf55f
hash_lock should always be initialized
2009-07-07 15:41:19 -07:00
20989cd4f2
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-07-06 17:01:43 -07:00
e49bdb470e
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-07-06 17:01:42 -07:00
169b3085db
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
...
Conflicts:
module/zfs/dmu.c
2009-07-06 17:01:30 -07:00
621679fec6
Update to use dmu_read() instead of dmu_read_impl() now that a 'flags'
...
argument is available. This flags argument was added to allow a clean
API for disabling prefetch, so I'll update zpios to use it in preference
to the module option hack used before.
2009-07-06 16:51:59 -07:00
1175906fbc
Update zerocopy patch to be consistent with new flags arg
...
passed to dmu_read(). It would be nice to have one of these
for dmu_write() as well but we have do without for now.
2009-07-06 16:01:41 -07:00
07a56371aa
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
...
Conflicts:
module/zfs/zfs_vfsops.c
2009-07-06 15:17:38 -07:00
Brian Behlendorf