Brian Behlendorf
82a162c11c
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 16:44:15 -07:00
Brian Behlendorf
e706328579
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-12 16:44:13 -07:00
Brian Behlendorf
f8764e9947
Add NONE option for --with-linux and --with-spl.
...
This is used when you need to configure the project but you don't
actually intend to build it. Thus you don't really need access to
either the kernel or spl headers and symbols. At Livermore I use
this when I only intend to use the 'make dist' or 'make srpm' target.
2009-03-12 16:31:28 -07:00
Brian Behlendorf
93643c487f
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-03-12 15:54:13 -07:00
Brian Behlendorf
c7979c6f55
Check realpath() return code.
2009-03-12 15:49:23 -07:00
Brian Behlendorf
f53b66715b
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-03-12 15:47:38 -07:00
Brian Behlendorf
71bc2e8c03
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-12 15:47:36 -07:00
Brian Behlendorf
fe62441bdb
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-03-12 15:47:29 -07:00
Brian Behlendorf
59edc6fb4e
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-12 15:47:27 -07:00
Brian Behlendorf
165d2c878d
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-03-12 15:47:20 -07:00
Brian Behlendorf
b998074378
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-03-12 15:47:18 -07:00
Brian Behlendorf
aeee16eeb0
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-12 15:47:11 -07:00
Brian Behlendorf
640eb1d542
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-12 15:47:07 -07:00
Brian Behlendorf
55161a829d
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-03-12 15:46:59 -07:00
Brian Behlendorf
2a21321766
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-12 15:46:56 -07:00
Brian Behlendorf
7eb1fd17f7
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-03-12 15:46:47 -07:00
Brian Behlendorf
c399ce1af8
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-12 15:46:45 -07:00
Brian Behlendorf
7f29eec138
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-03-12 15:46:38 -07:00
Brian Behlendorf
c0480e3050
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-12 15:46:36 -07:00
Brian Behlendorf
580d57d9f5
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-03-12 15:46:30 -07:00
Brian Behlendorf
efb120466a
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-03-12 15:46:27 -07:00
Brian Behlendorf
e9269db2d2
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-03-12 15:46:20 -07:00
Brian Behlendorf
8c6d5f619a
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-03-12 15:46:18 -07:00
Brian Behlendorf
ef2fd13b34
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-03-12 15:46:11 -07:00
Brian Behlendorf
4d43809012
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-12 15:46:06 -07:00
Brian Behlendorf
5ee824a12e
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-03-12 15:45:59 -07:00
Brian Behlendorf
e892c29158
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-12 15:45:56 -07:00
Brian Behlendorf
cd160b1c01
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-03-12 15:45:48 -07:00
Brian Behlendorf
a6c9a937d0
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-12 15:45:46 -07:00
Brian Behlendorf
da3760fea4
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-12 15:45:45 -07:00
Brian Behlendorf
ca9935904c
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-12 15:45:34 -07:00
Brian Behlendorf
03c9f2a07b
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-12 15:45:30 -07:00
Brian Behlendorf
c6c2cf2b51
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-12 15:45:29 -07:00
Brian Behlendorf
2c7d6b622d
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-03-12 15:45:17 -07:00
Brian Behlendorf
9f7d7fd384
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-03-12 15:45:15 -07:00
Brian Behlendorf
3e2c02edf7
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-03-12 15:45:08 -07:00
Brian Behlendorf
edb8e53164
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-03-12 15:45:06 -07:00
Brian Behlendorf
b32b2ed926
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-03-12 15:45:00 -07:00
Brian Behlendorf
9e4850e3d1
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-12 15:44:54 -07:00
Brian Behlendorf
4c5f8744f4
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-03-12 15:44:47 -07:00
Brian Behlendorf
65d5ab8f56
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-12 15:44:42 -07:00
Brian Behlendorf
ad5dc71d81
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-03-12 15:44:36 -07:00
Brian Behlendorf
20c5c3d0d2
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-12 15:44:34 -07:00
Brian Behlendorf
09a907d7f9
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-03-12 15:44:27 -07:00
Brian Behlendorf
e6534fb8e1
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-03-12 15:44:25 -07:00
Brian Behlendorf
5a7e7e9d3b
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 15:44:18 -07:00
Brian Behlendorf
134bed459a
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-12 15:44:15 -07:00
Brian Behlendorf
82ce8b00f3
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 15:44:14 -07:00
Brian Behlendorf
6a5acaa105
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 15:44:13 -07:00
Brian Behlendorf
539bf4451c
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-03-12 15:39:28 -07:00