Brian Behlendorf
|
88a693c203
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2010-03-08 16:09:19 -08:00 |
|
Brian Behlendorf
|
fe82eaea36
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2010-03-08 16:09:17 -08:00 |
|
Brian Behlendorf
|
e84a9fe6db
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2010-03-08 16:09:12 -08:00 |
|
Brian Behlendorf
|
5dbe16c280
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2010-03-08 16:09:10 -08:00 |
|
Brian Behlendorf
|
351126428d
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2010-03-08 16:09:06 -08:00 |
|
Brian Behlendorf
|
0c6550821d
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2010-03-08 16:09:04 -08:00 |
|
Brian Behlendorf
|
4d20a2fa91
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2010-03-08 16:08:59 -08:00 |
|
Brian Behlendorf
|
065bc46c34
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2010-03-08 16:08:58 -08:00 |
|
Brian Behlendorf
|
947a21c977
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2010-03-08 16:08:53 -08:00 |
|
Brian Behlendorf
|
7f1fc3e842
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2010-03-08 16:08:51 -08:00 |
|
Brian Behlendorf
|
6b79b65dc4
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2010-03-08 16:08:46 -08:00 |
|
Brian Behlendorf
|
30ea25d8c6
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2010-03-08 16:08:45 -08:00 |
|
Brian Behlendorf
|
0fc90303e6
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2010-03-08 16:08:40 -08:00 |
|
Brian Behlendorf
|
fd64f41dc8
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2010-03-08 16:08:38 -08:00 |
|
Brian Behlendorf
|
1879c3a255
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2010-03-08 16:08:33 -08:00 |
|
Brian Behlendorf
|
9a5870a6d7
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2010-03-08 16:08:31 -08:00 |
|
Brian Behlendorf
|
4c02864e07
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2010-03-08 16:08:26 -08:00 |
|
Brian Behlendorf
|
2410d9ad6b
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2010-03-08 16:08:23 -08:00 |
|
Brian Behlendorf
|
3d0db470b4
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2010-03-08 16:08:18 -08:00 |
|
Brian Behlendorf
|
54abc99016
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2010-03-08 16:08:16 -08:00 |
|
Brian Behlendorf
|
a72fd5ed67
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2010-03-08 16:08:11 -08:00 |
|
Brian Behlendorf
|
cb074ec815
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2010-03-08 16:08:09 -08:00 |
|
Brian Behlendorf
|
5f2477452f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2010-03-08 16:08:09 -08:00 |
|
Brian Behlendorf
|
2d7a254cf8
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2010-03-08 16:08:00 -08:00 |
|
Brian Behlendorf
|
695756528f
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2010-03-08 16:07:58 -08:00 |
|
Brian Behlendorf
|
371763b265
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2010-03-08 16:07:53 -08:00 |
|
Brian Behlendorf
|
43c2d4c3df
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2010-03-08 16:07:51 -08:00 |
|
Brian Behlendorf
|
15cc970552
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2010-03-08 16:07:47 -08:00 |
|
Brian Behlendorf
|
1f320e11e2
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2010-03-08 16:07:45 -08:00 |
|
Brian Behlendorf
|
64da100fee
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2010-03-08 16:07:40 -08:00 |
|
Brian Behlendorf
|
c2309e47ca
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2010-03-08 16:07:38 -08:00 |
Brian J. Murrell
|
3f30f74414
|
Check for spl in ../spl if not found in install path
If the spl source could not be found in /usr/src/spl-*, also try to
find it in ../spl. This makes finding it in a development sandbox
more natural.
|
2010-03-08 16:04:25 -08:00 |
|
Brian Behlendorf
|
9a3247cee5
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2010-03-08 14:58:20 -08:00 |
|
Brian Behlendorf
|
00b11565dd
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2010-03-08 14:58:18 -08:00 |
|
Brian Behlendorf
|
43c7372c94
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2010-03-08 14:58:12 -08:00 |
|
Brian Behlendorf
|
1f433449b1
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2010-03-08 14:58:11 -08:00 |
|
Brian Behlendorf
|
fcb8485180
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2010-03-08 14:58:05 -08:00 |
|
Brian Behlendorf
|
04437f8776
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2010-03-08 14:58:03 -08:00 |
|
Brian Behlendorf
|
3ffee59557
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2010-03-08 14:57:58 -08:00 |
|
Brian Behlendorf
|
9fbe94a9ae
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2010-03-08 14:57:56 -08:00 |
|
Brian Behlendorf
|
ff30e7f8f0
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2010-03-08 14:57:50 -08:00 |
|
Brian Behlendorf
|
cb49458424
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2010-03-08 14:57:48 -08:00 |
|
Brian Behlendorf
|
3f4492afeb
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2010-03-08 14:57:43 -08:00 |
|
Brian Behlendorf
|
7b42e72288
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2010-03-08 14:57:41 -08:00 |
|
Brian Behlendorf
|
2b67fc7e44
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2010-03-08 14:57:36 -08:00 |
|
Brian Behlendorf
|
46277db25d
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2010-03-08 14:57:34 -08:00 |
|
Brian Behlendorf
|
48061f85e6
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2010-03-08 14:57:28 -08:00 |
|
Brian Behlendorf
|
60a0d50970
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2010-03-08 14:57:26 -08:00 |
|
Brian Behlendorf
|
11b5cee901
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2010-03-08 14:57:21 -08:00 |
|
Brian Behlendorf
|
e6e867d14b
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2010-03-08 14:57:19 -08:00 |