Brian Behlendorf
406432e9aa
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-14 11:01:19 -07:00
Brian Behlendorf
821a652a56
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-14 11:01:17 -07:00
Brian Behlendorf
8a1731c9d6
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-14 11:01:10 -07:00
Brian Behlendorf
c075f62962
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-14 11:01:08 -07:00
Brian Behlendorf
d6eb951480
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-14 11:01:01 -07:00
Brian Behlendorf
0f536cc091
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-14 11:00:59 -07:00
Brian Behlendorf
9b1c66b644
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-14 11:00:52 -07:00
Brian Behlendorf
950a76951e
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-14 11:00:50 -07:00
Brian Behlendorf
82a82d4553
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-05-14 11:00:42 -07:00
Brian Behlendorf
7088870ae6
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-05-14 11:00:41 -07:00
Brian Behlendorf
4308f791d3
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-14 11:00:34 -07:00
Brian Behlendorf
e64cab1869
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-14 11:00:32 -07:00
Brian Behlendorf
d3e6cf956d
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-14 11:00:25 -07:00
Brian Behlendorf
6248e67a87
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-14 11:00:23 -07:00
Brian Behlendorf
6897da54b0
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-14 11:00:15 -07:00
Brian Behlendorf
ec5fb3c63e
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-14 11:00:13 -07:00
Brian Behlendorf
c6101dde56
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-14 11:00:06 -07:00
Brian Behlendorf
c9eeeb7cbc
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-14 11:00:04 -07:00
Brian Behlendorf
6ae8aa39ab
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-05-14 10:59:57 -07:00
Brian Behlendorf
52d787f391
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2010-05-14 10:59:55 -07:00
Brian Behlendorf
20ee89f0f2
Add nvpair_alloc_fixed.c in to libnvpair build.
2010-05-14 10:55:02 -07:00
Brian Behlendorf
3809bc6ac5
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-14 10:44:12 -07:00
Brian Behlendorf
9b8aa5f57e
Extend libspl as required for linux FMA integration.
...
These changes lay some of the ground work for supporting something
similar to FMA event under Solaris. In particular these changes
add or modify the following areas.
First off an implementation of the gethrestime() function is added
to libspl. Secondly, the missing type processorid_t has been added.
And finally the lib/libspl/include/sys/fm/{protocol.h|util.h} stub
headers have been removed in favor of updating the full versions
in module/zfs/include/sys/fm/{protocol.h|util.h} to work cleanly
in both user and kernel space.
2010-05-14 10:33:00 -07:00
Brian Behlendorf
8e870b63d0
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-04-29 13:15:30 -07:00
Brian Behlendorf
d6f1146154
Remove changes from linux-have-sysevent to prepare for topic branch removal.
2010-04-29 13:12:25 -07:00
Brian Behlendorf
ab2e9b8b7f
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2010-04-29 13:08:10 -07:00
Brian Behlendorf
44ce1eb434
Remove changes from linux-have-fm to prepare for topic branch removal.
2010-04-29 13:04:35 -07:00
Brian Behlendorf
bfd847de96
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-04-29 12:34:03 -07:00
Brian Behlendorf
6b6a14b748
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-04-29 12:34:01 -07:00
Brian Behlendorf
a5c64d72d0
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-04-29 12:33:55 -07:00
Brian Behlendorf
f9813a0382
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-04-29 12:33:53 -07:00
Brian Behlendorf
d573622589
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-04-29 12:33:47 -07:00
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