d186e0ca0c
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-05-14 12:55:01 -07:00
d89c845543
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-05-14 12:54:59 -07:00
143c34eecf
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-05-14 12:54:52 -07:00
474981ffac
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-14 12:54:50 -07:00
b144320bb9
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-05-14 12:54:43 -07:00
89396b5fff
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-05-14 12:54:41 -07:00
2a39c44637
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-14 12:54:34 -07:00
0ea6b5a042
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-14 12:54:33 -07:00
3b47d76d8e
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-14 12:54:25 -07:00
bbfb1eeb4c
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-14 12:54:23 -07:00
cb7be901de
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-14 12:54:16 -07:00
9d8124099b
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-14 12:54:14 -07:00
2fdc73fada
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-14 12:54:07 -07:00
b79b434e68
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-14 12:54:05 -07:00
41456b2bd7
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-05-14 12:53:58 -07:00
06f00866eb
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-05-14 12:53:56 -07:00
a57ba8a2ec
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-14 12:53:49 -07:00
0ff45595f2
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-14 12:53:47 -07:00
6ded08648c
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-14 12:53:40 -07:00
98add009b7
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-14 12:53:38 -07:00
4afb1dc2f7
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-14 12:53:31 -07:00
da073cac3d
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-14 12:53:29 -07:00
d333ae7ec9
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-14 12:53:21 -07:00
c550f0172b
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-14 12:53:20 -07:00
7d30d5032a
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-05-14 12:53:12 -07:00
a7b3190198
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2010-05-14 12:53:10 -07:00
98d5d8bd50
Add missing include path for FMA aware zpool command.
2010-05-14 11:57:48 -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
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
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
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
Brian Behlendorf