bf864d2003
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-24 09:16:18 -07:00
88577ac326
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-07-24 09:16:10 -07:00
f1d7c355b0
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-07-24 09:16:07 -07:00
4edfcf44ec
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-24 09:15:59 -07:00
f6cfe53c97
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-24 09:15:57 -07:00
82ca18caae
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-24 09:15:56 -07:00
825c086a4e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-07-24 09:15:55 -07:00
4a4280c0f7
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2009-07-24 09:15:54 -07:00
e4610d7991
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2009-07-24 09:15:53 -07:00
1b4dfb80fb
Increase buffer size for nvlist for large configurations
...
It's still not clear to me why the default value here is large
enough Solaris. I hit this limit again when setting up 120 SATA
drives configured as 15 raidz2 groups each containing 8 drives.
We expect to go bigger so we may just want to spend a little
time and figure out how to make this all dynamic.
2009-07-24 08:53:18 -07:00
75ddd265cb
Remove a stray | in the zpios-survey script which caused it to fail.
2009-07-24 08:50:05 -07:00
8397283a8e
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-07-21 17:15:39 -07:00
2759dc2498
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-07-21 17:15:37 -07:00
5a20afbd2b
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-07-21 17:15:29 -07:00
18285f753b
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-07-21 17:15:25 -07:00
3275cf9bff
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-07-21 17:15:17 -07:00
cf589bf209
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-21 17:15:15 -07:00
905c08185d
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-07-21 17:15:07 -07:00
f524995b77
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-07-21 17:15:06 -07:00
56da0ab565
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-21 17:14:58 -07:00
95ac4fb8ac
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-07-21 17:14:57 -07:00
cfbf47e1f8
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-07-21 17:14:46 -07:00
154612b330
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-21 17:14:43 -07:00
f73958688b
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-07-21 17:14:35 -07:00
dfc48f38c1
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-21 17:14:34 -07:00
1e61702d6f
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-07-21 17:14:26 -07:00
5cbe59a6e3
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-21 17:14:24 -07:00
d167a86a60
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-07-21 17:14:17 -07:00
8b5a2d3e30
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-07-21 17:14:15 -07:00
55a6b0f280
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-07-21 17:14:02 -07:00
e57df7f8dd
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-21 17:14:00 -07:00
c7a7f3fab3
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-07-21 17:13:52 -07:00
c13e6c968a
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-21 17:13:50 -07:00
b6cdc52092
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-07-21 17:13:43 -07:00
fd22e1896f
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-21 17:13:41 -07:00
077c5bfb3f
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-07-21 17:13:33 -07:00
bbefda7821
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-21 17:13:28 -07:00
a2450e7e79
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-21 17:13:27 -07:00
7e42fe84f2
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-21 17:13:13 -07:00
651171b615
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-21 17:13:11 -07:00
e94ba2ffb4
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-21 17:13:10 -07:00
bf9473d285
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-07-21 17:12:56 -07:00
d3cdde6150
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-07-21 17:12:49 -07:00
c06df6056c
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-07-21 17:12:41 -07:00
2aebadd6f3
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-07-21 17:12:39 -07:00
7d3728242f
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-07-21 17:12:32 -07:00
e0f858d0a8
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-21 17:12:30 -07:00
7b17084bc1
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-07-21 17:12:23 -07:00
de7161ec92
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-07-21 17:12:16 -07:00
00298f0a9a
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-07-21 17:12:05 -07:00
Brian Behlendorf