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
21ff93d4df
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-07-28 16:39:01 -07:00
a29ba1823f
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-07-28 16:38:54 -07:00
e27ac302ec
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-07-28 16:38:52 -07:00
7d675a379a
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-07-28 16:38:45 -07:00
3c0c629fa7
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-07-28 16:38:43 -07:00
82f58e6363
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-07-28 16:38:36 -07:00
646047cfb8
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-07-28 16:38:34 -07:00
94629b63d9
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-07-28 16:38:27 -07:00
5ca831dc8f
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-07-28 16:38:25 -07:00
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
c103da5abc
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-07-28 16:36:02 -07:00
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
8703ab6181
Merge branch 'linux-have-mlslabel' into refs/top-bases/linux-zfs-branch
2010-07-28 09:43:17 -07:00
0ba726eff2
Merge commit 'refs/top-bases/linux-have-mlslabel' into linux-have-mlslabel
2010-07-28 09:43:15 -07:00
3b93e986e6
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-07-28 09:43:09 -07:00
667652473e
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-07-28 09:43:07 -07:00
b4066301cc
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-07-28 09:43:02 -07:00
5abf9f86f7
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-07-28 09:43:00 -07:00
43aa3a97cf
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-07-28 09:42:55 -07:00
e4c6872a13
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-07-28 09:42:53 -07:00
a27dc6f3f6
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-07-28 09:42:47 -07:00
ff94a98d45
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-07-28 09:42:45 -07:00
30a4bf1894
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-07-28 09:42:40 -07:00
fb937722a8
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-07-28 09:42:37 -07:00
08d315da05
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-07-28 09:42:32 -07:00
e15c32cb3e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-07-28 09:42:30 -07:00
b2ffea8975
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-07-28 09:42:24 -07:00
f7c966c315
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-07-28 09:42:22 -07:00
4ec24d19ab
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-07-28 09:42:16 -07:00
486d76bab9
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-07-28 09:42:14 -07:00
3d1caebdb5
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-07-28 09:42:09 -07:00
f3c202410c
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-07-28 09:42:06 -07:00
9e12c81c45
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-07-28 09:42:01 -07:00
8768170f0b
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-07-28 09:41:58 -07:00
5bfb977158
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-07-28 09:41:53 -07:00
425a0a201f
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-07-28 09:41:51 -07:00
Brian Behlendorf