Commit Graph

4053 Commits

Author SHA1 Message Date
Brian Behlendorf 9f27168dfc Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-28 12:42:35 -07:00
Brian Behlendorf 06da6ccf97 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-28 12:42:30 -07:00
Brian Behlendorf 818eafca5b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-05-28 12:42:30 -07:00
Brian Behlendorf 73bd7b144f Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2010-05-28 12:42:30 -07:00
Brian Behlendorf c91169c7c5 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
Conflicts:
	lib/libzfs/libzfs_util.c
2010-05-28 12:42:27 -07:00
Brian Behlendorf fb72c6ef81 Revert gcc-shadow using -Wno-shadow I can live with
While I would rather fix all the instances where something is shadowed
it complicates tracking the OpenSolaris code where they either don't
seem to care or have different conflicts.  Anyway, this ends up being
more simply gratutous change than I care for.
2010-05-28 12:34:45 -07:00
Brian Behlendorf a57300b294 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-28 12:24:02 -07:00
Brian Behlendorf 65b4821860 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-28 12:23:57 -07:00
Brian Behlendorf c07f84d10e Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-05-28 12:23:57 -07:00
Brian Behlendorf 062e85a7c6 Remove fix-get-configs dependency from fix-branch 2010-05-28 12:21:44 -07:00
Brian Behlendorf f9a3e518df Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-28 12:20:35 -07:00
Brian Behlendorf 01123eabf6 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-28 12:20:31 -07:00
Brian Behlendorf fcfae8fbee Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2010-05-28 12:20:30 -07:00
Brian Behlendorf 8390fe4b4b Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-05-28 12:20:30 -07:00
Brian Behlendorf f1e299054c Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-05-28 12:20:30 -07:00
Brian Behlendorf c37d6443a4 Revert fix-get-configs should no longer be needed 2010-05-28 12:18:45 -07:00
Brian Behlendorf 7ea2eba25c Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-28 10:25:16 -07:00
Brian Behlendorf 3c2eb55c13 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-28 10:24:56 -07:00
Brian Behlendorf ad342f9c21 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-05-28 10:24:56 -07:00
Brian Behlendorf a5e72e009e Remove fix-dsl_pool_t dependency from fix-branch 2010-05-28 10:18:41 -07:00
Brian Behlendorf d19bda5de8 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-28 10:15:04 -07:00
Brian Behlendorf 3450d1f3b5 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-28 10:14:43 -07:00
Brian Behlendorf af051f1250 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-05-28 10:14:43 -07:00
Brian Behlendorf 157df8338c Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2010-05-28 10:14:42 -07:00
Brian Behlendorf 32a6c32c9f Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-05-28 10:14:42 -07:00
Brian Behlendorf 9eec97e163 Revert fix-dsl_pool_t fixed upstream 2010-05-28 10:08:02 -07:00
Brian Behlendorf f6f8a76860 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-28 10:01:05 -07:00
Brian Behlendorf c2c3358a6f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-28 10:00:44 -07:00
Brian Behlendorf 11510b3513 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-05-28 10:00:44 -07:00
Brian Behlendorf 396fb1e235 Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2010-05-28 10:00:43 -07:00
Brian Behlendorf 9997b16134 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-05-28 10:00:43 -07:00
Brian Behlendorf 11a9bfc7f8 Revert fix-taskq changes reevaluate after update. 2010-05-28 09:54:03 -07:00
Brian Behlendorf 182fb913fb Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-27 20:06:30 -07:00
Brian Behlendorf e4d0d5c10c Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-27 20:06:10 -07:00
Brian Behlendorf 9644f95585 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-05-27 20:06:10 -07:00
Brian Behlendorf be3f503d82 Remove fix-clock-wrap dependency from fix-branch 2010-05-27 19:59:32 -07:00
Brian Behlendorf fb7a18aa41 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-27 17:02:36 -07:00
Brian Behlendorf 2fbe461b55 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-27 17:02:15 -07:00
Brian Behlendorf a7dcb2247a Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-05-27 17:02:14 -07:00
Brian Behlendorf 03fdccb846 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-05-27 17:02:14 -07:00
Brian Behlendorf 146ded4db2 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2010-05-27 17:02:13 -07:00
Brian Behlendorf db069704ed Revert fix-clock-wrap fixed upstream
This was more or less fixed upstream.  Instead of directly accessing
lbolt they now use ddi_get_lbolt() which we can have do the right
thing is the SPL so we don't need to carry this patch.
2010-05-27 16:54:23 -07:00
Brian Behlendorf 38ba4d7b71 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-27 16:40:57 -07:00
Brian Behlendorf dcf4bc1e52 Re-remove feature-branch dependency. 2010-05-27 16:34:02 -07:00
Brian Behlendorf 2407213cbd Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-27 16:21:40 -07:00
Brian Behlendorf ea431b4dc6 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-27 16:14:04 -07:00
Brian Behlendorf 319f69734b Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Conflicts:
	cmd/ztest/ztest.c
2010-05-27 16:13:19 -07:00
Brian Behlendorf 390995db28 Revert all remaining changes. 2010-05-27 14:25:06 -07:00
Brian Behlendorf 63fce783d6 Readd feature-branch to get the last of the reversions 2010-05-27 14:23:51 -07:00
Brian Behlendorf 079d4e640f Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-27 14:20:26 -07:00