67624a608d
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-07-21 17:15:42 -07:00
154612b330
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-21 17:14:43 -07:00
e85aaac131
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-21 17:11:47 -07:00
bc8c87d2f3
Missed one instance of losetup -f to unused_loop_device change
2009-07-21 17:05:13 -07:00
29425ec461
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-07-21 16:33:18 -07:00
8e5f7bd9d5
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-21 16:32:18 -07:00
4988767d65
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-21 16:29:25 -07:00
b9c3c7a2f4
The losetup -f option is unavailable for SLES10 use unused_loop_device()
...
SLES10 ships util-linux-2.12r-35.30 which does not support the -f option
to losetup. To avoid this problem the unused_loop_device() function was
added which attempts to find an unused loop device by checking each
/dev/loop* device with losetup to see if it is configured.
2009-07-21 16:17:54 -07:00
8e8b9b1816
Refresh autogen products
2009-07-21 14:54:30 -07:00
24f0f6da93
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-07-21 14:52:49 -07:00
efb9868b69
Pretty-up the 'make check' output
...
Reasonable output from 'make check' now looks roughly like this. The
big change is the consolidation of the all the zpion test results in
to a single table which can be easily scanned for failures/problems.
==================================== ZTEST ====================================
5 vdevs, 7 datasets, 23 threads, 300 seconds...
Pass 1, SIGKILL, 1 ENOSPC, 13.8% of 238M used, 17% done, 4m07s to go
Pass 2, SIGKILL, 1 ENOSPC, 23.7% of 238M used, 38% done, 3m04s to go
Pass 3, SIGKILL, 0 ENOSPC, 27.0% of 238M used, 66% done, 1m42s to go
Pass 4, SIGKILL, 0 ENOSPC, 27.4% of 238M used, 75% done, 1m14s to go
Pass 5, SIGKILL, 0 ENOSPC, 27.9% of 238M used, 89% done, 32s to go
Pass 6, Complete, 0 ENOSPC, 14.0% of 476M used, 100% done, 0s to go
5 killed, 1 completed, 83% kill rate
==================================== ZPIOS ====================================
status name id wr-data wr-ch wr-bw rd-data rd-ch rd-bw
-------------------------------------------------------------------------------
PASS: file-raid0 0 64m 64 13.04m 64m 64 842.22m
PASS: file-raid10 0 64m 64 134.19m 64m 64 842.22m
PASS: file-raidz 0 64m 64 87.56m 64m 64 853.45m
PASS: file-raidz2 0 64m 64 134.19m 64m 64 853.45m
PASS: lo-raid0 0 64m 64 429.59m 64m 64 14.63m
PASS: lo-raid10 0 64m 64 397.57m 64m 64 771.19m
PASS: lo-raidz 0 64m 64 206.48m 64m 64 688.27m
PASS: lo-raidz2 0 64m 64 14.34m 64m 64 711.21m
2009-07-21 14:41:35 -07:00
8feebe7d65
Refresh autogen products
2009-07-16 10:29:59 -07:00
78cb1bf653
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-07-10 11:54:17 -07:00
379941cb58
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-10 11:52:55 -07:00
dd51c10883
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-10 11:48:59 -07:00
e16ffab302
SPLBUILD now includes modules
2009-07-10 11:37:30 -07:00
8283120116
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-07-06 17:01:47 -07:00
621679fec6
Update to use dmu_read() instead of dmu_read_impl() now that a 'flags'
...
argument is available. This flags argument was added to allow a clean
API for disabling prefetch, so I'll update zpios to use it in preference
to the module option hack used before.
2009-07-06 16:51:59 -07:00
e3d5b2a900
Refresh autogen products
2009-07-01 11:37:26 -07:00
80cfd98d8e
Refresh autogen products
2009-06-09 16:46:26 -07:00
26f70525ee
Refresh autogen products
2009-06-08 16:33:33 -07:00
04621618cf
Refresh autogen products
2009-03-18 15:05:35 -07:00
e61fa20d11
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-18 14:40:31 -07:00
b46037b53f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-18 14:39:07 -07:00
c6ddce0341
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-18 14:31:53 -07:00
70407622a7
Move `make check` ztest under ./scripts where the module stack is loaded.
2009-03-18 14:19:04 -07:00
7fa1ced508
Refresh autogen products, remove stray zdump Makefile.in
2009-03-12 16:48:12 -07:00
0fe418c548
Refresh autogen products
2009-03-12 15:55:23 -07:00
e1b736ecc8
Refresh autogen products
2009-03-10 11:42:01 -07:00
1efe435474
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-20 22:32:34 -08:00
a31814f47b
Further profile infrastructure
2009-02-20 22:27:18 -08:00
986591a09a
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-20 14:33:30 -08:00
4d28f29b6c
Update profile scripts with additional upcalls for fine grained profiling
2009-02-20 14:28:00 -08:00
2c7ad95794
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-19 14:57:33 -08:00
ddfa570f42
Initial update to support zpios.sh profiling option.
2009-02-19 14:51:40 -08:00
7f38c76b46
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-06 15:30:40 -08:00
9b649b23ef
Minor update to ensure heads make it in to the log
2009-02-06 15:28:49 -08:00
31ea8d7dac
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-06 15:10:43 -08:00
a06c9a3bd9
Add 2 more zpios test configurations
2009-02-06 15:08:15 -08:00
4c927e213a
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-06 15:02:54 -08:00
29b6072595
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-02-06 15:02:29 -08:00
4bb45ceef2
Update zpios survey script to use new scripts
2009-02-06 14:58:31 -08:00
3c9fa95530
Add 2 new args for zpool_create to take extra args
2009-02-06 14:57:37 -08:00
e47bda4086
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-06 11:52:21 -08:00
1d0f2ef9e2
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-02-06 11:51:57 -08:00
df7399e08b
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-02-06 11:50:28 -08:00
97e40aae09
Add 8 basic x4550 configurations which are of interest.
2009-02-06 11:47:09 -08:00
261a715644
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-03 09:30:32 -08:00
59008dc2b2
Updated script to actually make name
2009-02-03 09:28:19 -08:00
e61d9fdd2e
Refresh autogen products
2009-01-26 19:02:55 -08:00
4faa475094
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-26 17:05:47 -08:00
822b9d99ab
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-26 17:05:06 -08:00
0f54a996b3
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-26 17:02:41 -08:00
9e6f35e5cf
Add loopback based test configs
2009-01-26 16:59:02 -08:00
13a81ba014
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-20 21:38:32 -08:00
28dd8ef8b9
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-20 21:38:07 -08:00
39fe5b1cf9
Minor script fixes
2009-01-20 21:34:29 -08:00
9991894b21
Minor script fix
2009-01-20 21:34:09 -08:00
66db92c86f
Refresh autogen products
2009-01-20 21:14:51 -08:00
8562f0355e
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-20 21:11:32 -08:00
623125820d
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-20 21:10:42 -08:00
9094c3a1fc
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-20 21:07:46 -08:00
15c9eb903f
Add 4 basic file based testr configs
2009-01-20 21:03:02 -08:00
564dcf1adf
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-20 17:05:53 -08:00
2f0f133d97
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-20 17:04:55 -08:00
cebdbdf440
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-20 17:02:03 -08:00
40c5baafa2
Add file based config, and update the lo config to use real loopback devices, interestingly this currently fails
2009-01-20 16:57:45 -08:00
b4365b87b4
Refresh autogen products
2009-01-20 16:01:52 -08:00
b47904cfce
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-20 15:56:57 -08:00
2334ba2bb1
Add a script scripts, update Makefiles
2009-01-20 15:54:50 -08:00
f927ee3245
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-20 15:48:20 -08:00
67d3177f05
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-20 15:47:55 -08:00
1996f04880
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-20 15:46:31 -08:00
26d0de9a92
Update Makefiles for recent script updates
2009-01-20 15:43:21 -08:00
ce9376bfd0
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-20 15:39:30 -08:00
f146db30ba
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-20 15:39:06 -08:00
af43246767
Minor script cleanup
2009-01-20 15:34:38 -08:00
e125a95615
Minor script cleanup
2009-01-20 15:34:02 -08:00
cac715ea81
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-20 14:34:10 -08:00
eb205c6e62
Update zpios to use zpool-create -d arg, and zpios-start/stop
2009-01-20 14:32:02 -08:00
ffbf23b8c8
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-20 14:18:44 -08:00
5fb57391c8
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-20 14:18:21 -08:00
bd11623ed8
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-20 14:17:03 -08:00
5ae334d138
Use .sh extension
2009-01-20 14:15:05 -08:00
6e5a963b38
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-20 14:14:17 -08:00
2c886c6b7a
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-20 14:13:54 -08:00
d163810def
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-20 14:12:33 -08:00
db210bf236
Add destroy functionality to zpool create, needed for generic use by zpios.sh
2009-01-20 14:10:30 -08:00
a1b9f5596b
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-16 15:09:25 -08:00
7ac621f98b
Update zpios usage
2009-01-16 15:07:30 -08:00
2af42007b5
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-16 15:00:44 -08:00
81a6dfd781
Minor cleanup, module unload
2009-01-16 14:58:48 -08:00
1d4ad2d62e
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-16 14:56:15 -08:00
188291aa77
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-16 14:55:53 -08:00
cf839c012a
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-16 14:54:34 -08:00
5bf49743a6
Add minor root check for convenience
2009-01-16 14:51:52 -08:00
1ede1f1f93
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-16 14:33:21 -08:00
e77bb8debf
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-16 14:32:59 -08:00
681d703126
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-16 14:31:41 -08:00
6a6da5a14d
Minor verbage cleanup
2009-01-16 14:29:31 -08:00
21434a0b3f
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-16 14:00:53 -08:00
fc48083154
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-16 14:00:30 -08:00
7b5ceef9df
Minor fixes
2009-01-16 13:57:12 -08:00
87d7387f62
Minor fixes
2009-01-16 13:56:14 -08:00
71c6ba8698
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-16 13:29:23 -08:00
ae9df6c1c6
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-16 13:29:01 -08:00
89ed048230
Minor script updates almost ready to test
2009-01-16 13:25:47 -08:00
e7b183b7f2
Minor script updates almost ready to test
2009-01-16 13:25:16 -08:00
c5097bc792
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-16 12:57:42 -08:00
c582d80811
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-16 12:57:20 -08:00
4a56333c4c
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-16 12:55:58 -08:00
7c761d45a8
Further work towards getting zpool-create working
2009-01-16 12:53:12 -08:00
2d9ebe2d08
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-16 12:27:21 -08:00
0289edb7e6
Update to use the zpool-create.sh script
2009-01-16 12:23:53 -08:00
7c98f76d30
Update zpios infrastructure to be more flexible
2009-01-16 12:19:15 -08:00
da9f36856e
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-16 12:13:43 -08:00
cfabdf6bda
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-16 12:13:03 -08:00
9b3a269da4
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-16 12:10:27 -08:00
b38eb997f4
Update helper scripts to me more helpful
2009-01-16 12:06:25 -08:00
8d87f5aba5
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-15 10:18:25 -08:00
62895cf669
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-15 10:18:00 -08:00
b487be0ca1
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-15 10:16:36 -08:00
6932f09bb5
Reference module not modules in SPL for consistency
2009-01-15 10:14:21 -08:00
87fc3feb38
Refresh autogen products
2009-01-14 16:09:39 -08:00
6d0121d8de
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-14 16:05:29 -08:00
9339984f08
Resolve conflict
2009-01-14 16:04:33 -08:00
9e40470aa0
Resolve conflict
2009-01-14 15:42:28 -08:00
9c22d76019
Minor 'make check' updates
2009-01-14 15:38:56 -08:00
8778a30cda
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-14 10:42:47 -08:00
e090338e7b
Update zpios script
2009-01-14 10:40:50 -08:00
0ba5ba5928
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-14 10:01:14 -08:00
bbd8816aff
Add missing echo
2009-01-14 09:59:10 -08:00
bb39dca861
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-14 09:20:14 -08:00
b0bf494b37
Refresh script to handle errors (missing stat files) more gracefully, additionally lengthen the default test to a useful length
2009-01-14 09:18:16 -08:00
0817cfaa4b
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-14 08:42:39 -08:00
1194e0412f
Change all instances of kpios to zpios
2009-01-14 08:38:35 -08:00
4ab6c5a787
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-13 11:58:07 -08:00
b8761b72ba
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-13 11:57:49 -08:00
bba6e9829d
Handle the case when 'module-name=' is passed down without args. This is handy and shouldn't generate warnings
2009-01-13 11:54:38 -08:00
6caf53f208
Minor script update
2009-01-13 11:53:51 -08:00
7d9e65d7e1
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-13 11:18:14 -08:00
7356c2045e
Update zpios.sh script to reference zfs not zpool, additionally remove unneed module load console message
2009-01-13 11:16:12 -08:00
d2acaf11ef
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-09 13:34:52 -08:00
82d446c832
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-09 13:34:34 -08:00
bf5a93e1ec
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-09 13:33:14 -08:00
04638ead67
Change zpool module name to zfs and update references
2009-01-09 13:31:16 -08:00
9855548496
Refresh autogen products
2009-01-09 11:35:52 -08:00
78986fd642
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-08 16:57:29 -08:00
7b4f45a7fc
Update zpios.sh to use zfs.sh plus error handling
2009-01-08 16:53:29 -08:00
a54bab4825
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-08 16:28:52 -08:00
0270ffced8
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-08 16:28:08 -08:00
85d3e34d3d
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-08 16:25:03 -08:00
cd0b9c18b7
Update helper scripts
2009-01-08 16:20:25 -08:00
0e5efe5ab4
Update helper scripts
2009-01-08 16:19:38 -08:00
b9bba7db62
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-08 11:01:58 -08:00
7681ddef00
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-08 11:01:37 -08:00
4802584080
Update execute permissions
2009-01-08 10:57:24 -08:00
9f7833f915
Update execute permissions
2009-01-08 10:56:53 -08:00
8fd8d8a2fd
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-05 12:13:17 -08:00
ddcdf90ceb
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-05 12:12:33 -08:00
888028c161
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-05 12:09:13 -08:00
07c6176130
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-05 12:09:06 -08:00
42bcb36c89
Add unicode library
2009-01-05 12:03:23 -08:00
6a73d9f6b2
Remove zdump.c
2009-01-05 11:17:09 -08:00
3767655021
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-05 11:16:11 -08:00
ef0ca51855
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-05 11:14:50 -08:00
578a1db888
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-05 11:11:56 -08:00
36b849fa51
Remove zdump, it's an unrelateds command which I added simply due to the z* command convention
2009-01-05 11:10:13 -08:00
9403f4a605
Refresh autogen products
2008-12-23 12:39:25 -08:00
d8c0d57440
Refresh autogen products
2008-12-23 10:41:37 -08:00
3d2e368e7a
Refresh autogen products
2008-12-19 16:12:00 -08:00
bffca6c378
Refresh autogen products
2008-12-15 16:58:02 -08:00
e859b8f5f2
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-15 10:31:44 -08:00
6bea798e15
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-15 10:31:35 -08:00
b3b77e63be
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-15 10:30:11 -08:00
e631cff898
Remove lustre config, we really shouldn't need this. A user space build -should- be able to contain all the needed APIs. If this is not the case we can reintroduce this.
2008-12-15 10:28:14 -08:00
ff56741803
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-12 13:48:28 -08:00
2f484dd74c
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-12 13:48:20 -08:00
1e5d1c3168
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-12 13:47:00 -08:00
9ba40d2bfa
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-12 13:46:57 -08:00
810db7e0a2
Remove zcommon reference merged in to zpool
2008-12-12 13:41:20 -08:00
3b4adb0abd
Add all autogen products
2008-12-12 09:25:06 -08:00
42572599e3
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-11 16:35:36 -08:00
6535464bdb
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-11 16:35:30 -08:00
a0914f2770
Refresh
2008-12-11 16:31:44 -08:00
a0e625a878
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-11 15:41:52 -08:00
6b2c60acca
Moving lib/libspl to linux-libspl branch
2008-12-11 15:38:59 -08:00
0b18a1c458
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-11 14:27:13 -08:00
01531d559d
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-11 14:27:03 -08:00
3bd537afcc
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-11 14:25:35 -08:00
503068ecec
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-11 14:25:32 -08:00
a4076c7544
Script updates
2008-12-11 14:21:14 -08:00
c4911ece24
Move library files to lib
2008-12-11 14:16:55 -08:00
f3dd8353de
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-11 14:07:16 -08:00
33ee5a1dbe
Resolve conflict
2008-12-11 14:06:30 -08:00
44ffa43709
Resolve conflict
2008-12-11 14:01:47 -08:00
98ce19f04c
Update avl, nvpair, spl to unique build dirs
2008-12-11 13:54:57 -08:00
3cd6b7e8e7
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-11 11:48:05 -08:00
50d862cf14
Resolve conflict
2008-12-11 11:47:40 -08:00
aca9d98817
Fix conflict
2008-12-11 11:34:16 -08:00
Brian Behlendorf