63bf9b60d5
Revert changes from this branch so the branch may be removed. We
...
will integrate the latest patch from Sun here once everything is
is basically working. This verion of the patch is out of date
anyone and may not be what is needed.
2008-12-18 11:31:32 -08:00
c7dd5e026f
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2008-12-18 11:26:31 -08:00
74d4f44d1d
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-18 11:26:29 -08:00
d2083bda5a
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-18 11:26:25 -08:00
262cfab991
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-18 11:26:24 -08:00
fc34e3ec62
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2008-12-18 11:26:19 -08:00
0ab2957537
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-18 11:26:17 -08:00
7d3aa7252e
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2008-12-18 11:26:14 -08:00
97e7f7b4ec
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-18 11:26:12 -08:00
632950a719
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2008-12-18 11:26:08 -08:00
1dffab4002
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-18 11:26:06 -08:00
4c4f8aa67b
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2008-12-18 11:26:02 -08:00
9f0d68b8c4
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-18 11:26:00 -08:00
37a0e79cc4
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2008-12-18 11:25:57 -08:00
12c9cecac5
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-18 11:25:55 -08:00
8e4252605c
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2008-12-18 11:25:51 -08:00
bf5db00d71
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 11:25:49 -08:00
48c9d45470
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-18 11:25:46 -08:00
59ef7e8a19
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-18 11:25:43 -08:00
7e0e68ad0f
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2008-12-18 11:25:40 -08:00
cd437110ea
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-18 11:25:38 -08:00
d64408e0e5
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
2008-12-18 11:25:34 -08:00
c3a0bf49a1
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 11:25:33 -08:00
3907b558de
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2008-12-18 11:25:30 -08:00
1321f5a556
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 11:25:28 -08:00
62618f9e3f
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 11:25:28 -08:00
59de83533d
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2008-12-18 11:25:22 -08:00
5598664343
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-18 11:25:21 -08:00
139baeef7c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 11:25:20 -08:00
4cd2a01056
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2008-12-18 11:25:14 -08:00
1467b3ec61
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-18 11:25:13 -08:00
34b7807dcf
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2008-12-18 11:25:10 -08:00
c169cfd26c
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2008-12-18 11:25:08 -08:00
35af08eef4
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2008-12-18 11:25:05 -08:00
d27a92e176
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-18 11:25:03 -08:00
1077f2dfa1
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2008-12-18 11:25:00 -08:00
87a10fa22e
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2008-12-18 11:24:58 -08:00
02eaaaaa32
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2008-12-18 11:24:55 -08:00
b66a092193
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2008-12-18 11:24:53 -08:00
8b3c167e46
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2008-12-18 11:24:50 -08:00
7a79a21f04
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2008-12-18 11:24:49 -08:00
3eb408d18e
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-18 11:24:45 -08:00
07e90f6761
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2008-12-18 11:24:42 -08:00
2ef6ae9654
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 11:24:42 -08:00
d431498139
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 11:24:41 -08:00
17ac467bf0
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2008-12-18 11:24:40 -08:00
22f122e505
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 11:24:40 -08:00
50b70a0c9a
Resolve time conflict
2008-12-18 11:22:39 -08:00
69c7aab4de
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2008-12-18 10:07:42 -08:00
b62b9a17aa
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-18 10:07:40 -08:00
Brian Behlendorf