Commit Graph

20202 Commits

Author SHA1 Message Date
Brian Behlendorf b11cf27d2d Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch 2010-07-28 16:41:14 -07:00
Brian Behlendorf 03d8ed574a Merge commit 'refs/top-bases/linux-topology' into linux-topology 2010-07-28 16:41:12 -07:00
Brian Behlendorf 0b9529ebd5 Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch 2010-07-28 16:41:05 -07:00
Brian Behlendorf b901bf46d6 Merge commit 'refs/top-bases/linux-sha2' into linux-sha2 2010-07-28 16:41:02 -07:00
Brian Behlendorf 11b58f8920 Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch 2010-07-28 16:40:55 -07:00
Brian Behlendorf ee76748418 Merge commit 'refs/top-bases/linux-user-util' into linux-user-util 2010-07-28 16:40:52 -07:00
Brian Behlendorf 1d7b3a7d48 Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-07-28 16:40:45 -07:00
Brian Behlendorf d442e095ae Merge commit 'refs/top-bases/linux-events' into linux-events 2010-07-28 16:40:43 -07:00
Brian Behlendorf 115792be67 Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch 2010-07-28 16:40:36 -07:00
Brian Behlendorf dace0e95bc Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-07-28 16:40:34 -07:00
Brian Behlendorf c59d19112a Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-07-28 16:40:27 -07:00
Brian Behlendorf 6b815e7a72 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-07-28 16:40:25 -07:00
Brian Behlendorf 06a406b5d9 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-07-28 16:40:19 -07:00
Brian Behlendorf 67ca959d72 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-07-28 16:40:17 -07:00
Brian Behlendorf f4e1ede348 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-07-28 16:40:10 -07:00
Brian Behlendorf 7068febe97 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-07-28 16:40:08 -07:00
Brian Behlendorf a534432828 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-07-28 16:40:01 -07:00
Brian Behlendorf 6a20664889 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-07-28 16:39:59 -07:00
Brian Behlendorf 1ae3aac2d9 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-07-28 16:39:52 -07:00
Brian Behlendorf 4913cf54aa Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-07-28 16:39:51 -07:00
Brian Behlendorf e23cc0aaec Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-07-28 16:39:44 -07:00
Brian Behlendorf cdd1bba311 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
Conflicts:

	scripts/common.sh.in
2010-07-28 16:39:33 -07:00
Brian Behlendorf 4aa076110d Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-07-28 16:39:03 -07:00
Brian Behlendorf 21ff93d4df Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-07-28 16:39:01 -07:00
Brian Behlendorf a29ba1823f Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-07-28 16:38:54 -07:00
Brian Behlendorf e27ac302ec Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-07-28 16:38:52 -07:00
Brian Behlendorf 7d675a379a Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-07-28 16:38:45 -07:00
Brian Behlendorf 3c0c629fa7 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-07-28 16:38:43 -07:00
Brian Behlendorf 82f58e6363 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-07-28 16:38:36 -07:00
Brian Behlendorf 646047cfb8 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-07-28 16:38:34 -07:00
Brian Behlendorf 94629b63d9 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-07-28 16:38:27 -07:00
Brian Behlendorf 5ca831dc8f Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-07-28 16:38:25 -07:00
Brian Behlendorf 9c024583e9 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
Conflicts:

	scripts/common.sh.in
2010-07-28 16:36:49 -07:00
Brian Behlendorf c103da5abc Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-07-28 16:36:02 -07:00
Brian Behlendorf 26e61dd074 Generate common.sh with paths from configure
The common.sh script assumed that it was either being run from
in-tree or was installed under /usr/libexec/zfs.  If this was
not the case, because of say the default --prefix=/usr/local,
then the paths would be wrong.  To fix this common.sh is now
generated from common.sh.in with the correct path information
provided at configure time.
2010-07-28 16:30:45 -07:00
Brian Behlendorf 8703ab6181 Merge branch 'linux-have-mlslabel' into refs/top-bases/linux-zfs-branch 2010-07-28 09:43:17 -07:00
Brian Behlendorf 0ba726eff2 Merge commit 'refs/top-bases/linux-have-mlslabel' into linux-have-mlslabel 2010-07-28 09:43:15 -07:00
Brian Behlendorf 3b93e986e6 Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch 2010-07-28 09:43:09 -07:00
Brian Behlendorf 667652473e Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread 2010-07-28 09:43:07 -07:00
Brian Behlendorf b4066301cc Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch 2010-07-28 09:43:02 -07:00
Brian Behlendorf 5abf9f86f7 Merge commit 'refs/top-bases/linux-topology' into linux-topology 2010-07-28 09:43:00 -07:00
Brian Behlendorf 43aa3a97cf Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch 2010-07-28 09:42:55 -07:00
Brian Behlendorf e4c6872a13 Merge commit 'refs/top-bases/linux-sha2' into linux-sha2 2010-07-28 09:42:53 -07:00
Brian Behlendorf a27dc6f3f6 Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch 2010-07-28 09:42:47 -07:00
Brian Behlendorf ff94a98d45 Merge commit 'refs/top-bases/linux-user-util' into linux-user-util 2010-07-28 09:42:45 -07:00
Brian Behlendorf 30a4bf1894 Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-07-28 09:42:40 -07:00
Brian Behlendorf fb937722a8 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-07-28 09:42:37 -07:00
Brian Behlendorf 08d315da05 Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch 2010-07-28 09:42:32 -07:00
Brian Behlendorf e15c32cb3e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-07-28 09:42:30 -07:00
Brian Behlendorf b2ffea8975 Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-07-28 09:42:24 -07:00