Commit Graph

18463 Commits

Author SHA1 Message Date
Brian Behlendorf 5b09380297 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
Conflicts:
	config/Rules.am
2010-03-26 15:52:42 -07:00
Brian Behlendorf 409916a9ac Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2010-03-26 15:49:57 -07:00
Brian Behlendorf 10486210ac Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-03-26 15:49:56 -07:00
Brian Behlendorf da393c2bda Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-03-26 15:49:55 -07:00
Brian Behlendorf cb0002eb96 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-03-26 15:49:48 -07:00
Brian Behlendorf fad6045aef Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-03-26 15:49:46 -07:00
Brian Behlendorf 054337134a Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-03-26 15:49:39 -07:00
Brian Behlendorf 52f3ce51c1 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-03-26 15:49:37 -07:00
Brian Behlendorf f93bbfa33f Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-03-26 15:49:30 -07:00
Brian Behlendorf d6a0475275 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-03-26 15:49:28 -07:00
Brian Behlendorf 2b04a643e3 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-03-26 15:49:20 -07:00
Brian Behlendorf 4886900ac9 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-03-26 15:49:18 -07:00
Brian Behlendorf c408103736 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-03-26 15:49:10 -07:00
Brian Behlendorf 2d652f3e1a Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-03-26 15:49:08 -07:00
Brian Behlendorf 4165b3c418 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-03-26 15:49:00 -07:00
Brian Behlendorf a5ac944c72 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-03-26 15:48:57 -07:00
Brian Behlendorf fb332143f4 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2010-03-26 15:48:49 -07:00
Brian Behlendorf bc8417594e Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2010-03-26 15:48:47 -07:00
Brian Behlendorf 11e1dff39e Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-03-26 15:48:39 -07:00
Brian Behlendorf cc55fe137c Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-03-26 15:48:37 -07:00
Brian Behlendorf 6b41607850 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-03-26 15:48:28 -07:00
Brian Behlendorf e2fd5968c0 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-03-26 15:48:24 -07:00
Brian Behlendorf c54212861a Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2010-03-26 15:48:15 -07:00
Brian Behlendorf 63dd6a8baa Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-03-26 15:48:13 -07:00
Brian Behlendorf f16ae1e181 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-03-26 15:48:13 -07:00
Brian Behlendorf de258a9515 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-03-26 15:47:56 -07:00
Brian Behlendorf 2764814bd8 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-03-26 15:47:54 -07:00
Brian Behlendorf 9f07a3e687 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-03-26 15:47:46 -07:00
Brian Behlendorf f1a8f91fc9 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-03-26 15:47:43 -07:00
Brian Behlendorf ff4b295295 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2010-03-26 15:47:35 -07:00
Brian Behlendorf 3af59dd400 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2010-03-26 15:47:33 -07:00
Brian Behlendorf 52e5e6e6d0 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-03-26 15:47:25 -07:00
Brian Behlendorf fed567af5d Merge commit 'refs/top-bases/linux-docs' into linux-docs 2010-03-26 15:47:23 -07:00
Brian Behlendorf 23ab272555 Add support for 'make -s' silent builds
The cleanest way to do this is to set AM_LIBTOOLFLAGS = --silent.  However,
AM_LIBTOOLFLAGS is not honored by automake-1.9.6-2.1 which is what I have
been using.  To cleanly handle this I am updating to automake-1.11-3 which
is why it looks like there is a lot of churn in the Makefiles.
2010-03-26 15:41:41 -07:00
Brian Behlendorf a235e4b8b9 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-03-23 14:58:29 -07:00
Brian Behlendorf cae53b7be1 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2010-03-23 14:58:28 -07:00
Brian Behlendorf fb427cf371 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-03-23 14:58:27 -07:00
Brian Behlendorf ee2a998f37 Move zfs_config.h include to command line -include
Remove the few places in the code where zfs_config.h is included.
It is now added to the gcc compile line to ensure the config results
2010-03-23 14:54:00 -07:00
Brian Behlendorf ddb2e7a5c5 Refresh autogen products 2010-03-22 17:01:13 -07:00
Brian Behlendorf 42dbe7d063 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
Conflicts:
	config/kernel.m4
2010-03-22 16:58:51 -07:00
Brian Behlendorf 1fa4bbef05 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2010-03-22 16:58:04 -07:00
Brian Behlendorf 069cae80d8 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-03-22 16:58:03 -07:00
Brian Behlendorf c143c0d2f6 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-03-22 16:58:01 -07:00
Brian Behlendorf ef66d17dde Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-03-22 16:57:54 -07:00
Brian Behlendorf 0a27fbaa53 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-03-22 16:57:53 -07:00
Brian Behlendorf 4308bd8f6d Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-03-22 16:57:45 -07:00
Brian Behlendorf 042c88abe0 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-03-22 16:57:43 -07:00
Brian Behlendorf 8cd1f7cc7c Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-03-22 16:57:36 -07:00
Brian Behlendorf ff4507b28e Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-03-22 16:57:34 -07:00
Brian Behlendorf 3ff5833e7c Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-03-22 16:57:27 -07:00