ad35d8a9bf
Merge commit 'refs/top-bases/top' into top
2010-07-27 09:51:20 -07:00
b17ac3d3eb
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-07-27 09:51:18 -07:00
3e0f56f466
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-07-27 09:51:17 -07:00
45fab7f26c
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-07-27 09:51:16 -07:00
2a9e09ec68
Export DMU/ZFS symbols required by Lustre
...
The dmu_objset_pool() and dmu_objset_name() symbols are needed
by Lustre and should be exported.
Signed-off-by: Ricardo M. Correia <ricardo.correia@oracle.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2010-07-27 09:46:23 -07:00
641f300534
Refresh autogen products
2010-07-23 11:50:26 -07:00
7dfe24e94d
Merge commit 'refs/top-bases/top' into top
2010-07-23 11:47:10 -07:00
12e83b7c88
Merge commit 'refs/top-bases/top' into top
2010-07-23 11:44:51 -07:00
b00509d4b3
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-07-23 11:44:49 -07:00
c6b07eb02f
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-07-23 11:44:47 -07:00
b7b4299f8d
Merge branch 'linux-have-mlslabel' into refs/top-bases/linux-zfs-branch
2010-07-23 11:44:46 -07:00
35fee94a3b
Merge commit 'refs/top-bases/linux-have-mlslabel' into linux-have-mlslabel
2010-07-23 11:44:44 -07:00
4809e2ca51
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-07-23 11:44:38 -07:00
52a44811c1
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-07-23 11:44:36 -07:00
e7c67bf7dd
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-07-23 11:44:31 -07:00
43434f31b4
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-07-23 11:44:29 -07:00
ae07f6b274
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-07-23 11:44:23 -07:00
d807ad0467
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-07-23 11:44:21 -07:00
97f4d761eb
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-07-23 11:44:16 -07:00
d7f48baeaf
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-07-23 11:44:14 -07:00
f99575c9aa
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-07-23 11:44:08 -07:00
641bfb323a
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-07-23 11:44:06 -07:00
d58992da9e
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-07-23 11:44:01 -07:00
b1d4ae7d16
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-07-23 11:43:59 -07:00
c7ebc84438
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-07-23 11:43:52 -07:00
0fa271ff04
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-07-23 11:43:50 -07:00
f25f0a2109
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-07-23 11:43:45 -07:00
8c6554d526
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-07-23 11:43:42 -07:00
3a53d9f426
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-07-23 11:43:37 -07:00
7319797f38
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-07-23 11:43:35 -07:00
dcabd1a0c6
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-07-23 11:43:29 -07:00
158a465240
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-07-23 11:43:27 -07:00
bca0b40198
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-07-23 11:43:21 -07:00
0408af1eb1
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-07-23 11:43:20 -07:00
e0549da1d9
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-07-23 11:43:14 -07:00
a602feecbb
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-07-23 11:43:12 -07:00
63266fb77f
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-07-23 11:43:06 -07:00
f920386365
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-07-23 11:43:04 -07:00
d4e662c493
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-07-23 11:42:58 -07:00
6f120e4b4f
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-07-23 11:42:56 -07:00
3a041de01f
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-07-23 11:42:51 -07:00
fd7a0e109c
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-07-23 11:42:48 -07:00
cb432832d3
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-07-23 11:42:43 -07:00
79bf615660
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-07-23 11:42:41 -07:00
4a2d053c39
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-07-23 11:42:34 -07:00
f4ca8d1a41
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-07-23 11:42:32 -07:00
2deb475123
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-07-23 11:42:26 -07:00
6e615d3108
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-07-23 11:42:24 -07:00
758275af4f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-07-23 11:42:23 -07:00
2eee7b0ee5
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-07-23 11:42:22 -07:00
Brian Behlendorf
Ricardo M. Correia