Brian Behlendorf
|
2f14e49238
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2010-04-29 12:33:45 -07:00 |
|
Brian Behlendorf
|
35afc56620
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:33:39 -07:00 |
|
Brian Behlendorf
|
c58ab91288
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2010-04-29 12:33:37 -07:00 |
|
Brian Behlendorf
|
07f09c5b94
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:33:31 -07:00 |
|
Brian Behlendorf
|
d92dfd67f1
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2010-04-29 12:33:29 -07:00 |
|
Brian Behlendorf
|
41b1fdbaff
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:33:23 -07:00 |
|
Brian Behlendorf
|
a2a5e4f1f1
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2010-04-29 12:33:21 -07:00 |
|
Brian Behlendorf
|
97c26fc60a
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:33:15 -07:00 |
|
Brian Behlendorf
|
75aeefed1d
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2010-04-29 12:33:13 -07:00 |
|
Brian Behlendorf
|
8e917c740b
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:33:07 -07:00 |
|
Brian Behlendorf
|
3a1dbbd69c
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2010-04-29 12:33:05 -07:00 |
|
Brian Behlendorf
|
a649ba5f00
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:32:59 -07:00 |
|
Brian Behlendorf
|
d4fcfa8cd6
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2010-04-29 12:32:57 -07:00 |
|
Brian Behlendorf
|
6d86128981
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:32:51 -07:00 |
|
Brian Behlendorf
|
7d37312f6c
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2010-04-29 12:32:49 -07:00 |
|
Brian Behlendorf
|
0bf57f091f
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:32:43 -07:00 |
|
Brian Behlendorf
|
0eff4db8b4
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2010-04-29 12:32:41 -07:00 |
|
Brian Behlendorf
|
756a371a3f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2010-04-29 12:32:40 -07:00 |
|
Brian Behlendorf
|
acc1f41a6f
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:32:29 -07:00 |
|
Brian Behlendorf
|
da44260bb8
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2010-04-29 12:32:27 -07:00 |
|
Brian Behlendorf
|
2d29264297
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:32:21 -07:00 |
|
Brian Behlendorf
|
600cb84701
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2010-04-29 12:32:18 -07:00 |
|
Brian Behlendorf
|
19db622885
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:32:12 -07:00 |
|
Brian Behlendorf
|
2e161f3b31
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2010-04-29 12:32:10 -07:00 |
|
Brian Behlendorf
|
a3b3d2b059
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:32:04 -07:00 |
|
Brian Behlendorf
|
e6ed7e0a40
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2010-04-29 12:32:02 -07:00 |
|
Brian Behlendorf
|
98660aec20
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2010-04-29 12:32:01 -07:00 |
|
Brian Behlendorf
|
aa4a91aef5
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2010-04-29 12:32:00 -07:00 |
|
Brian Behlendorf
|
82782d7874
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2010-04-29 12:32:00 -07:00 |
|
Brian Behlendorf
|
354bebb795
|
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
|
2010-04-29 12:31:59 -07:00 |
|
Brian Behlendorf
|
c14cca5c07
|
Add fm_init/fm_fini stubs for user space FMA update.
|
2010-04-29 12:25:18 -07:00 |
|
Brian Behlendorf
|
89154c98f9
|
Update build system to include nvpair_alloc_fixed.c.
|
2010-04-29 12:24:25 -07:00 |
|
Brian Behlendorf
|
f26fce7b17
|
Strip ident pragma from module/nvpair/nvpair_alloc_fixed.c
|
2010-04-29 12:23:12 -07:00 |
|
Brian Behlendorf
|
f1a28f535c
|
Export required nv_alloc_fixed symbols.
|
2010-04-29 12:21:24 -07:00 |
|
Brian Behlendorf
|
00edd42487
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2010-04-29 12:06:39 -07:00 |
|
Brian Behlendorf
|
c030e94ea9
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:06:37 -07:00 |
|
Brian Behlendorf
|
40d58da788
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2010-04-29 12:06:35 -07:00 |
|
Brian Behlendorf
|
4786b80fd9
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:06:30 -07:00 |
|
Brian Behlendorf
|
b922689e38
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2010-04-29 12:06:28 -07:00 |
|
Brian Behlendorf
|
fa4f1ae294
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:06:22 -07:00 |
|
Brian Behlendorf
|
68cead1354
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2010-04-29 12:06:20 -07:00 |
|
Brian Behlendorf
|
bf2413d198
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:06:14 -07:00 |
|
Brian Behlendorf
|
ce6db1adbe
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2010-04-29 12:06:12 -07:00 |
|
Brian Behlendorf
|
9b8e498632
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:06:06 -07:00 |
|
Brian Behlendorf
|
9dc83e5f34
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2010-04-29 12:06:04 -07:00 |
|
Brian Behlendorf
|
abe9fd8b05
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:05:58 -07:00 |
|
Brian Behlendorf
|
3adc3d2d7d
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2010-04-29 12:05:56 -07:00 |
|
Brian Behlendorf
|
113a72f560
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:05:50 -07:00 |
|
Brian Behlendorf
|
4fdfc60d1d
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2010-04-29 12:05:48 -07:00 |
|
Brian Behlendorf
|
2eb8af298e
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:05:42 -07:00 |