Brian Behlendorf
45111d41df
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-03-12 16:47:22 -07:00
Brian Behlendorf
5ea6e0075c
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-03-12 16:47:20 -07:00
Brian Behlendorf
83d3024d8e
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-12 16:47:17 -07:00
Brian Behlendorf
9e1c54bc26
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-03-12 16:47:11 -07:00
Brian Behlendorf
0d00101433
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-12 16:47:09 -07:00
Brian Behlendorf
eff79805ee
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-03-12 16:47:02 -07:00
Brian Behlendorf
243e4b4f9b
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-03-12 16:46:59 -07:00
Brian Behlendorf
30eacdb2b9
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-12 16:46:53 -07:00
Brian Behlendorf
ff4fabc304
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-12 16:46:51 -07:00
Brian Behlendorf
4c6b354384
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-03-12 16:46:44 -07:00
Brian Behlendorf
9304575fc5
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-12 16:46:41 -07:00
Brian Behlendorf
496d1f2c14
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-03-12 16:46:35 -07:00
Brian Behlendorf
daaaf824c4
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-12 16:46:32 -07:00
Brian Behlendorf
161f481941
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-03-12 16:46:26 -07:00
Brian Behlendorf
b898408111
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-12 16:46:22 -07:00
Brian Behlendorf
14b09330ef
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-03-12 16:46:16 -07:00
Brian Behlendorf
53387b0e1a
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-03-12 16:46:13 -07:00
Brian Behlendorf
42f2e7023e
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-03-12 16:46:07 -07:00
Brian Behlendorf
7a12176eda
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-03-12 16:46:04 -07:00
Brian Behlendorf
c33841eaa7
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-03-12 16:45:58 -07:00
Brian Behlendorf
d5fe005c67
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-12 16:45:55 -07:00
Brian Behlendorf
44b7eb7d36
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-03-12 16:45:48 -07:00
Brian Behlendorf
863a69d790
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-12 16:45:45 -07:00
Brian Behlendorf
1f9f8ffe30
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-03-12 16:45:39 -07:00
Brian Behlendorf
4d98d11028
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-12 16:45:37 -07:00
Brian Behlendorf
a7bc5bef85
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-12 16:45:36 -07:00
Brian Behlendorf
45a3c3fdaf
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-12 16:45:25 -07:00
Brian Behlendorf
cad60ddc4f
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-12 16:45:22 -07:00
Brian Behlendorf
cb92f6711c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-12 16:45:21 -07:00
Brian Behlendorf
40da1d4c77
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-03-12 16:45:10 -07:00
Brian Behlendorf
a0f890e876
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-03-12 16:45:08 -07:00
Brian Behlendorf
4bbf674e59
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-03-12 16:45:02 -07:00
Brian Behlendorf
052d6b54ed
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-03-12 16:44:59 -07:00
Brian Behlendorf
c9ddfdbc0a
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-03-12 16:44:52 -07:00
Brian Behlendorf
839d091a45
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-12 16:44:50 -07:00
Brian Behlendorf
06c6a52f49
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-03-12 16:44:44 -07:00
Brian Behlendorf
974b6a81f1
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-12 16:44:41 -07:00
Brian Behlendorf
f33085bfe9
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-03-12 16:44:35 -07:00
Brian Behlendorf
034365156b
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-12 16:44:32 -07:00
Brian Behlendorf
8f152232f1
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-03-12 16:44:26 -07:00
Brian Behlendorf
add9a432d1
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-03-12 16:44:23 -07:00
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
cc3025635a
Merge commit 'refs/top-bases/top' into top
2009-03-12 15:57:06 -07:00
Brian Behlendorf
0fe418c548
Refresh autogen products
2009-03-12 15:55:23 -07:00
Brian Behlendorf
c503f8e0b7
Merge commit 'refs/top-bases/top' into top
2009-03-12 15:54:20 -07:00
Brian Behlendorf
b103899a39
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-12 15:54:18 -07:00
Brian Behlendorf
dea02ebefa
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-03-12 15:54:15 -07:00
Brian Behlendorf
93643c487f
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-03-12 15:54:13 -07:00
