Commit Graph

14698 Commits

Author SHA1 Message Date
Brian Behlendorf 0efe5966f2 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-07-27 10:51:22 -07:00
Brian Behlendorf 703c8df4b5 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-07-27 10:51:15 -07:00
Brian Behlendorf d11375ef9d Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-07-27 10:51:07 -07:00
Brian Behlendorf 1681e3cd4f Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-27 10:51:05 -07:00
Brian Behlendorf c06a523a33 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-07-27 10:50:58 -07:00
Brian Behlendorf 61c9972e1c Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-07-27 10:50:56 -07:00
Brian Behlendorf 38cc77f62b Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-27 10:50:48 -07:00
Brian Behlendorf 9b393fb35c Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-27 10:50:47 -07:00
Brian Behlendorf bff122d75a Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-07-27 10:50:39 -07:00
Brian Behlendorf 49d045e35d Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-27 10:50:31 -07:00
Brian Behlendorf fa46c0acd5 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-07-27 10:50:23 -07:00
Brian Behlendorf ef1f48b649 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-27 10:50:21 -07:00
Brian Behlendorf 7430bc80d3 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-07-27 10:50:14 -07:00
Brian Behlendorf b6b75df2ee Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-07-27 10:50:12 -07:00
Brian Behlendorf 85ddd1e5a1 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-07-27 10:50:05 -07:00
Brian Behlendorf 960f0c118a Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-07-27 10:50:03 -07:00
Brian Behlendorf f495f3a0da Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-07-27 10:49:50 -07:00
Brian Behlendorf eb9b374d87 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-07-27 10:49:48 -07:00
Brian Behlendorf 3da344900f Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-07-27 10:49:40 -07:00
Brian Behlendorf 5f0c206b77 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-27 10:49:38 -07:00
Brian Behlendorf 986a76645a Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-07-27 10:49:31 -07:00
Brian Behlendorf 3b1dce849a Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-27 10:49:29 -07:00
Brian Behlendorf 97fe449387 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-07-27 10:49:19 -07:00
Brian Behlendorf a9b7469efc Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-27 10:49:17 -07:00
Brian Behlendorf 0058e1070d Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-27 10:49:15 -07:00
Brian Behlendorf f338939725 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-07-27 10:49:01 -07:00
Brian Behlendorf a4ceefffcf Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-27 10:48:59 -07:00
Brian Behlendorf 69f433a07f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-27 10:48:58 -07:00
Brian Behlendorf 2a1e13463d Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-07-27 10:48:40 -07:00
Brian Behlendorf e5a2c40d78 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-07-27 10:48:35 -07:00
Brian Behlendorf f31a93b03a Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-07-27 10:48:28 -07:00
Brian Behlendorf 0b83bf0a41 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-07-27 10:48:26 -07:00
Brian Behlendorf 2d49686a7d Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-07-27 10:48:19 -07:00
Brian Behlendorf 4ffff8b0c5 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-27 10:48:17 -07:00
Brian Behlendorf 2d6739a8bb Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-07-27 10:48:05 -07:00
Brian Behlendorf 7dba45275d Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-07-27 10:47:59 -07:00
Brian Behlendorf 6462601604 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-07-27 10:47:50 -07:00
Brian Behlendorf 05f81e4861 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-07-27 10:47:49 -07:00
Brian Behlendorf 3cea70067c Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-07-27 10:47:41 -07:00
Brian Behlendorf 7c91c1a509 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-07-27 10:47:39 -07:00
Brian Behlendorf c7384d6b2e Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-27 10:47:31 -07:00
Brian Behlendorf 4bea4f6945 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-27 10:47:28 -07:00
Brian Behlendorf 3a431c68c2 Remove LINUXINCLUDE from autoconf wrapper, breaks 2.6.28+ kernels.
Modern kernel build systems at least post 2.6.16 will set this properly
so we should not.  In fact post 2.6.28 the include headers have moved
under arch so the guess we make here is completely wrong.  Letting
the kernel build system set this ensure it will be correct.  Also
drop the ulimit from the Makefile which, not surprisingly, turns out
to be very non-portable.  If your expecting failures set the ulimit
in your shell before kicking off the test suite.
2009-07-27 10:39:28 -07:00
Brian Behlendorf be8e82d835 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-07-24 16:36:57 -07:00
Brian Behlendorf 2c29ff1450 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-07-24 16:36:56 -07:00
Brian Behlendorf fcf48bdadd Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-07-24 16:36:54 -07:00
Brian Behlendorf 33a64b4287 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-07-24 16:36:47 -07:00
Brian Behlendorf 0afce1c579 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-07-24 16:36:45 -07:00
Brian Behlendorf b957969454 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-07-24 16:36:39 -07:00
Brian Behlendorf f0c41ca00b Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-24 16:36:33 -07:00