93f4668b9e
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-10-01 17:10:24 -07:00
0e957b2515
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-10-01 17:10:22 -07:00
449a75fda5
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-10-01 17:10:21 -07:00
ff90642129
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-10-01 17:10:19 -07:00
a869533da1
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-10-01 17:10:14 -07:00
8e8e3804d7
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-10-01 17:10:12 -07:00
1ca1ecbb28
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-10-01 17:10:07 -07:00
cabca237f3
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-10-01 17:10:05 -07:00
697359c3d4
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-10-01 17:10:00 -07:00
86694a106c
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-10-01 17:09:58 -07:00
8ee196e19c
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-10-01 17:09:53 -07:00
f9ab19bf6d
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-10-01 17:09:51 -07:00
48cc6b6565
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-10-01 17:09:46 -07:00
e02d23d347
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
...
Conflicts:
scripts/Makefile.am
2009-10-01 17:09:38 -07:00
8b9f836c99
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-10-01 17:08:55 -07:00
9ddc29794c
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-10-01 17:08:53 -07:00
ac13be8d7a
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-10-01 17:08:48 -07:00
d553271300
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-10-01 17:08:46 -07:00
faa7cc7ce6
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-10-01 17:08:41 -07:00
1e11cc0b7d
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-10-01 17:08:39 -07:00
3bd810a6c9
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-10-01 17:08:34 -07:00
b00eda8b35
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-10-01 17:08:32 -07:00
10e8860df3
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-10-01 17:08:27 -07:00
2b729a2a6f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-10-01 17:08:25 -07:00
e0a87f7ea8
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-10-01 17:08:19 -07:00
9b8183fad8
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-10-01 17:08:18 -07:00
fca44b80e9
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-10-01 17:08:12 -07:00
e6359e0281
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-10-01 17:08:10 -07:00
3c5e68488a
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-10-01 17:08:09 -07:00
cd01e2a6c9
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-10-01 17:08:00 -07:00
ea0bf0146f
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-10-01 17:07:58 -07:00
edd6ead31c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-10-01 17:07:57 -07:00
9fd246a1d3
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-10-01 17:07:47 -07:00
11b75fb752
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-10-01 17:07:46 -07:00
96e4ebf5ad
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-10-01 17:07:41 -07:00
29e58523ee
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-10-01 17:07:38 -07:00
c8a2fd3bd4
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-10-01 17:07:33 -07:00
eac0059874
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-10-01 17:07:31 -07:00
bba7a008b5
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-10-01 17:07:26 -07:00
6bdc74929b
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-10-01 17:07:24 -07:00
0c8583d3f7
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-10-01 17:07:19 -07:00
7eea1664aa
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-10-01 17:07:17 -07:00
8d3df842d1
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
scripts/Makefile.am
2009-10-01 17:05:55 -07:00
0613918a4a
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-10-01 17:04:19 -07:00
0efea24e73
Add zconfig.sg test script.
...
This is an initial script for validation of zfs/zpool configuration.
For now there is only one test here to ensure that /etc/zfs/zpool.cache
is being updated properly from the kernel module. Additional tests
should be added, I believe Richardo said there was an existing test
suite out there which validated the behavior of many zpool/zfs commands.
It would be nice to add that as appropriate.
2009-10-01 16:55:34 -07:00
69bdec9913
Update to use spl_module_{init,exit}() macro API.
2009-10-01 16:49:12 -07:00
6e2c55b5a6
Update to use spl_module_{init,exit}() macro API.
2009-10-01 16:47:49 -07:00
cb35312122
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-09-02 15:26:46 -07:00
8cf158573b
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-09-02 15:26:44 -07:00
159833d991
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-09-02 15:26:43 -07:00
Brian Behlendorf