Brian Behlendorf
|
2d4fa0b507
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:42:25 -07:00 |
|
Brian Behlendorf
|
e91a439720
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-07-09 10:42:21 -07:00 |
|
Brian Behlendorf
|
149eea21db
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:39:49 -07:00 |
|
Brian Behlendorf
|
a8d32ac1e2
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-07-09 10:39:46 -07:00 |
|
Brian Behlendorf
|
e5e94c40f7
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-07-09 10:39:44 -07:00 |
|
Brian Behlendorf
|
aa8ed32ee8
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-07-09 10:39:43 -07:00 |
|
Brian Behlendorf
|
9e394e10a9
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-07-09 10:39:41 -07:00 |
|
Brian Behlendorf
|
2cc278c96f
|
This change looks to have been made due to Sun bug 6803822, but
it's not exactly clear to me why. Regardless I'm taking it.
|
2009-07-09 10:30:06 -07:00 |
|
Brian Behlendorf
|
43af29de5f
|
Type int accidentally not declared at the top of the function.
|
2009-07-09 10:19:02 -07:00 |
|
Brian Behlendorf
|
4d410127b0
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-07-09 08:49:29 -07:00 |
|
Brian Behlendorf
|
cc6e67fa7f
|
Wrap sysevent includes until sysevent or something like it is implemented.
|
2009-07-09 08:40:33 -07:00 |
|
Brian Behlendorf
|
6e1c4e5bd6
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-07-08 09:18:45 -07:00 |
|
Brian Behlendorf
|
2aa22c1ccb
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-07-08 09:17:53 -07:00 |
|
Brian Behlendorf
|
1355255010
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-07-08 09:17:52 -07:00 |
|
Brian Behlendorf
|
affa4ec536
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-07-08 09:16:10 -07:00 |
|
Brian Behlendorf
|
aa636ae442
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-07-08 09:16:07 -07:00 |
|
Brian Behlendorf
|
33077ad631
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-07-08 09:16:05 -07:00 |
|
Brian Behlendorf
|
f00e6fe5c3
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-07-08 09:16:04 -07:00 |
|
Brian Behlendorf
|
5fc46112cb
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-07-08 09:16:01 -07:00 |
|
Brian Behlendorf
|
58f5e63293
|
Resolve a 2 new cases of for loop variable declared in for()
|
2009-07-08 09:05:37 -07:00 |
|
Brian Behlendorf
|
28718acdab
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-07-07 17:13:35 -07:00 |
|
Brian Behlendorf
|
756d013735
|
Disable autoexpand notifing sysevent which is not supported.
|
2009-07-07 17:06:27 -07:00 |
|
Brian Behlendorf
|
b9813a2a75
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-07-07 16:33:24 -07:00 |
|
Brian Behlendorf
|
68a0ba0bc3
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-07-07 16:32:35 -07:00 |
|
Brian Behlendorf
|
deacdbc785
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-07-07 16:32:34 -07:00 |
|
Brian Behlendorf
|
67e2052f52
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:31:01 -07:00 |
|
Brian Behlendorf
|
b6cf87b32d
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-07-07 16:30:58 -07:00 |
|
Brian Behlendorf
|
0a00d10c24
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-07-07 16:30:57 -07:00 |
|
Brian Behlendorf
|
02362668ac
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-07-07 16:30:56 -07:00 |
|
Brian Behlendorf
|
24daf7747f
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2009-07-07 16:30:54 -07:00 |
|
Brian Behlendorf
|
0e310d30de
|
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
|
2009-07-07 16:30:54 -07:00 |
|
Brian Behlendorf
|
10dcf485d3
|
First fit allocator unused comment it out.
|
2009-07-07 16:23:09 -07:00 |
|
Brian Behlendorf
|
ebda366c1c
|
Add missing case introduced by rebase.
|
2009-07-07 16:22:33 -07:00 |
|
Brian Behlendorf
|
82ad66258e
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-07-07 16:11:37 -07:00 |
|
Brian Behlendorf
|
f6880f590e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-07-07 16:10:52 -07:00 |
|
Brian Behlendorf
|
77e4a2039c
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-07-07 16:10:51 -07:00 |
|
Brian Behlendorf
|
e122a47cd8
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-07-07 16:09:19 -07:00 |
|
Brian Behlendorf
|
b8af4a2181
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-07-07 16:09:16 -07:00 |
|
Brian Behlendorf
|
c460e5edb0
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-07-07 16:09:15 -07:00 |
|
Brian Behlendorf
|
04a83f2337
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-07-07 16:09:13 -07:00 |
|
Brian Behlendorf
|
55b864f19b
|
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
|
2009-07-07 16:09:12 -07:00 |
|
Brian Behlendorf
|
f80f59f955
|
Add missing paranthesis for gcc.
|
2009-07-07 16:01:13 -07:00 |
|
Brian Behlendorf
|
21fa8cfb5d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-07-07 15:52:48 -07:00 |
|
Brian Behlendorf
|
71a479fb53
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-07-07 15:51:59 -07:00 |
|
Brian Behlendorf
|
91316b77b9
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-07-07 15:51:57 -07:00 |
|
Brian Behlendorf
|
795d799358
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-07-07 15:50:19 -07:00 |
|
Brian Behlendorf
|
4abc33bbe4
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-07-07 15:50:16 -07:00 |
|
Brian Behlendorf
|
e5c8fcd6b0
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-07-07 15:50:14 -07:00 |
|
Brian Behlendorf
|
c75167c985
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-07-07 15:50:13 -07:00 |
|
Brian Behlendorf
|
07a6b68575
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2009-07-07 15:50:11 -07:00 |