c9fbcee930
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-07-28 16:53:35 -07:00
277c60c8ae
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-07-28 16:53:29 -07:00
d2b7aac08f
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-07-28 16:53:27 -07:00
977b388a87
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-07-28 16:53:21 -07:00
2e29d1936d
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-07-28 16:53:19 -07:00
795e970d78
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-07-28 16:53:13 -07:00
7611c3a368
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-07-28 16:53:11 -07:00
6524fae4a4
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-07-28 16:53:06 -07:00
1e4fb7391c
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-07-28 16:53:03 -07:00
31bfaa3d9e
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-07-28 16:52:58 -07:00
c4f40de1a7
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-07-28 16:52:56 -07:00
2265bea6dd
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-07-28 16:52:49 -07:00
e01317ed8c
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-07-28 16:52:47 -07:00
b6e5a26537
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-07-28 16:52:40 -07:00
96ae916dbe
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-07-28 16:52:38 -07:00
4e111a5126
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-07-28 16:52:31 -07:00
5b1ade4b61
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-07-28 16:52:29 -07:00
1f1212fc5f
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-07-28 16:52:22 -07:00
61bba3bcd8
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-07-28 16:52:20 -07:00
1510a95acd
Add splat module to zfs.sh script
...
The splat module is only needed for the spl regression tests.
But if we add it to MODULES then 'zfs.sh -u' will be able to
unload it if needed, The downside if 'zfs.sh' will always
load it but it's overhead is minimal and in a production
setting you'll always be doing a 'modprobe zfs' anyway so
this is really just for testing.
2010-07-28 16:47:30 -07:00
9662934bd9
Add uninstall Makefile targets
...
Extend the Makefiles with an uninstall target to cleanly
remove a package which was installed with 'make install'.
Additionally, ensure a 'depmod -a' is run as part of the
install to update the module dependency information.
2010-07-28 16:47:26 -07:00
b2c62c2caa
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-07-28 16:47:05 -07:00
1ae7c424cf
Generate common.sh with paths from configure
...
These are the zpios related changes which were part of common.sh.
2010-07-28 16:42:16 -07:00
9415f65884
Merge branch 'linux-have-mlslabel' into refs/top-bases/linux-zfs-branch
2010-07-28 16:41:31 -07:00
7bc0b67522
Merge commit 'refs/top-bases/linux-have-mlslabel' into linux-have-mlslabel
2010-07-28 16:41:29 -07:00
aee3a32291
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-07-28 16:41:23 -07:00
7d9924000b
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-07-28 16:41:21 -07:00
b11cf27d2d
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-07-28 16:41:14 -07:00
03d8ed574a
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-07-28 16:41:12 -07:00
0b9529ebd5
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-07-28 16:41:05 -07:00
b901bf46d6
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-07-28 16:41:02 -07:00
11b58f8920
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-07-28 16:40:55 -07:00
ee76748418
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-07-28 16:40:52 -07:00
1d7b3a7d48
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-07-28 16:40:45 -07:00
d442e095ae
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-07-28 16:40:43 -07:00
115792be67
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-07-28 16:40:36 -07:00
dace0e95bc
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-07-28 16:40:34 -07:00
c59d19112a
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-07-28 16:40:27 -07:00
6b815e7a72
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-07-28 16:40:25 -07:00
06a406b5d9
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-07-28 16:40:19 -07:00
67ca959d72
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-07-28 16:40:17 -07:00
f4e1ede348
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-07-28 16:40:10 -07:00
7068febe97
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-07-28 16:40:08 -07:00
a534432828
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-07-28 16:40:01 -07:00
6a20664889
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-07-28 16:39:59 -07:00
1ae3aac2d9
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-07-28 16:39:52 -07:00
4913cf54aa
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-07-28 16:39:51 -07:00
e23cc0aaec
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-07-28 16:39:44 -07:00
cdd1bba311
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
...
Conflicts:
scripts/common.sh.in
2010-07-28 16:39:33 -07:00
4aa076110d
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-07-28 16:39:03 -07:00
Brian Behlendorf