e84605ae65
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-14 11:55:57 -07:00
aded580f0b
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-14 11:55:56 -07:00
93b00c558f
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
...
Conflicts:
module/zfs/zfs_ioctl.c
2010-05-14 11:51:27 -07:00
51ad7dc87d
New TopGit dependency: linux-kernel-device
2010-05-14 11:49:12 -07:00
0c443b1d13
Create linux-kernel-device topic branch.
...
This branch contains the majority of the changes required to cleanly
intergrate with Linux style special devices (/dev/zfs). Mainly this
means dropping all the Solaris style callbacks and replacing them
with the Linux equivilants. Additionally, this means slightly
expanding the zfs_ioc_* functions to include a 'struct file *' to
allow the tracking of private data for each open file descriptor.
This is very helpful when you need to maintain a little information
about the open file between ioctls().
2010-05-14 11:48:06 -07:00
cc997a2f7b
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-14 11:39:34 -07:00
7c3f11da5c
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-14 11:39:32 -07:00
3ae75228e3
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
...
Conflicts:
module/zfs/zfs_ioctl.c
2010-05-14 11:38:09 -07:00
d18f100fb7
Revert zfs_ioctl.c related changes.
...
All the changes required to cleanly integrate with linux style
devices are being moved to their own topic branch. It was abouti
to get to the point where too many topic branches each wanted to
tweak this code and it was getting confusing. To simplify this
all /dev/zfs device related changes are being moved to the
linux-kernel-device topic branch.
2010-05-14 11:24:36 -07:00
500e506883
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-14 11:01:48 -07:00
147f283be1
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-14 11:01:47 -07:00
1b3382ba9a
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-05-14 11:01:46 -07:00
c3ba25165e
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-05-14 11:01:44 -07:00
02b11f75d9
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-05-14 11:01:37 -07:00
8645ca847e
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-14 11:01:35 -07:00
6ee292f284
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-05-14 11:01:28 -07:00
6079f61615
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-05-14 11:01:26 -07:00
406432e9aa
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-14 11:01:19 -07:00
821a652a56
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-14 11:01:17 -07:00
8a1731c9d6
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-14 11:01:10 -07:00
c075f62962
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-14 11:01:08 -07:00
d6eb951480
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-14 11:01:01 -07:00
0f536cc091
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-14 11:00:59 -07:00
9b1c66b644
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-14 11:00:52 -07:00
950a76951e
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-14 11:00:50 -07:00
82a82d4553
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-05-14 11:00:42 -07:00
7088870ae6
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-05-14 11:00:41 -07:00
4308f791d3
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-14 11:00:34 -07:00
e64cab1869
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-14 11:00:32 -07:00
d3e6cf956d
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-14 11:00:25 -07:00
6248e67a87
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-14 11:00:23 -07:00
6897da54b0
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-14 11:00:15 -07:00
ec5fb3c63e
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-14 11:00:13 -07:00
c6101dde56
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-14 11:00:06 -07:00
c9eeeb7cbc
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-14 11:00:04 -07:00
6ae8aa39ab
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-05-14 10:59:57 -07:00
52d787f391
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2010-05-14 10:59:55 -07:00
20ee89f0f2
Add nvpair_alloc_fixed.c in to libnvpair build.
2010-05-14 10:55:02 -07:00
e55a65895a
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-14 10:44:14 -07:00
f0cc384348
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-14 10:44:12 -07:00
3809bc6ac5
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-14 10:44:12 -07:00
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
344420b25f
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-04-29 13:19:02 -07:00
a7bf204c6e
Remove linux-have-sysevent topic branch
2010-04-29 13:16:49 -07:00
02ddf26563
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-04-29 13:15:33 -07:00
7be23161bd
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-04-29 13:15:31 -07:00
8e870b63d0
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-04-29 13:15:30 -07:00
d6f1146154
Remove changes from linux-have-sysevent to prepare for topic branch removal.
2010-04-29 13:12:25 -07:00
23381cbafd
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-04-29 13:11:25 -07:00
f472cf9b26
Remove linux-have-fm topic branch
2010-04-29 13:09:08 -07:00
Brian Behlendorf