6807f4d1e5
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-28 12:46:12 -07:00
2c2cc18ae1
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-28 12:45:41 -07:00
3dc76b991d
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-05-28 12:45:41 -07:00
1d715125b6
Remove gcc-shadow from gcc-branch
2010-05-28 12:44:01 -07:00
de86e13755
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-28 12:43:04 -07:00
06da6ccf97
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-28 12:42:30 -07:00
818eafca5b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-05-28 12:42:30 -07:00
73bd7b144f
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-05-28 12:42:30 -07:00
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
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
65f7b9c86e
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-28 12:24:30 -07:00
65b4821860
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-28 12:23:57 -07:00
c07f84d10e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-28 12:23:57 -07:00
062e85a7c6
Remove fix-get-configs dependency from fix-branch
2010-05-28 12:21:44 -07:00
fc6d98ac7d
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-28 12:21:04 -07:00
01123eabf6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-28 12:20:31 -07:00
fcfae8fbee
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2010-05-28 12:20:30 -07:00
8390fe4b4b
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-28 12:20:30 -07:00
f1e299054c
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-05-28 12:20:30 -07:00
c37d6443a4
Revert fix-get-configs should no longer be needed
2010-05-28 12:18:45 -07:00
8c8ec2248e
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-28 10:26:49 -07:00
3c2eb55c13
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-28 10:24:56 -07:00
ad342f9c21
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-28 10:24:56 -07:00
a5e72e009e
Remove fix-dsl_pool_t dependency from fix-branch
2010-05-28 10:18:41 -07:00
d108095836
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-28 10:17:09 -07:00
3450d1f3b5
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-28 10:14:43 -07:00
af051f1250
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-28 10:14:43 -07:00
157df8338c
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2010-05-28 10:14:42 -07:00
32a6c32c9f
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-05-28 10:14:42 -07:00
9eec97e163
Revert fix-dsl_pool_t fixed upstream
2010-05-28 10:08:02 -07:00
3a6743c074
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-28 10:03:12 -07:00
c2c3358a6f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-28 10:00:44 -07:00
11510b3513
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-28 10:00:44 -07:00
396fb1e235
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-05-28 10:00:43 -07:00
9997b16134
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-05-28 10:00:43 -07:00
11a9bfc7f8
Revert fix-taskq changes reevaluate after update.
2010-05-28 09:54:03 -07:00
220d7d6b40
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-27 20:08:33 -07:00
e4d0d5c10c
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 20:06:10 -07:00
9644f95585
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-27 20:06:10 -07:00
be3f503d82
Remove fix-clock-wrap dependency from fix-branch
2010-05-27 19:59:32 -07:00
a9ea79346f
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-27 17:04:45 -07:00
2fbe461b55
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 17:02:15 -07:00
a7dcb2247a
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-27 17:02:14 -07:00
03fdccb846
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-05-27 17:02:14 -07:00
146ded4db2
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-05-27 17:02:13 -07:00
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
05a2a919c8
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-27 16:43:05 -07:00
dcf4bc1e52
Re-remove feature-branch dependency.
2010-05-27 16:34:02 -07:00
44fdc3f023
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-27 16:23:57 -07:00
ea431b4dc6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 16:14:04 -07:00
Brian Behlendorf