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
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
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
9eec97e163
Revert fix-dsl_pool_t fixed upstream
2010-05-28 10:08:02 -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
11a9bfc7f8
Revert fix-taskq changes reevaluate after update.
2010-05-28 09:54:03 -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
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
b265da19f0
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-05-27 14:15:08 -07:00
3a7896c8d2
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 14:15:08 -07:00
b754295dec
Revert feature-zap-cursor-to-key feature upstream
...
We can drop this feature and we will pick up the lastest version
during the b141 update.
2010-05-27 14:12:59 -07:00
d8e5eb56b8
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-05-27 13:42:00 -07:00
028e42b692
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 13:42:00 -07:00
1dc4235011
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-05-27 13:40:14 -07:00
1e32b3c781
Revert feature-commit-cb feature upstream
...
We can drop this feature and we will pick up the lastest version
during the b141 update.
2010-05-27 13:39:17 -07:00
3bd93e7103
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-05-27 13:25:20 -07:00
099e8e493a
Remove feature-pthreads prior to b141 update.
...
The pthreads change will need to be reworked and reapplied.
This will be easier to do from scratch rather than sort out
the merge.
2010-05-27 13:23:58 -07:00
98660aec20
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-04-29 12:32:01 -07:00
aa4a91aef5
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-04-29 12:32:00 -07:00
354bebb795
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-04-29 12:31:59 -07:00
89154c98f9
Update build system to include nvpair_alloc_fixed.c.
2010-04-29 12:24:25 -07:00
f26fce7b17
Strip ident pragma from module/nvpair/nvpair_alloc_fixed.c
2010-04-29 12:23:12 -07:00
66ba722b0a
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-04-29 12:04:36 -07:00
f3017eccb7
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-04-29 12:04:33 -07:00
7a062682fb
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-04-29 12:04:32 -07:00
9c10b70375
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-04-29 12:04:31 -07:00
9d8e4f07ff
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2010-04-29 12:04:30 -07:00
cf4e5324e9
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-04-29 12:04:18 -07:00
05b4f88b78
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2010-04-29 12:04:07 -07:00
8273e838de
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-04-29 12:04:03 -07:00
78559a049a
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2010-04-29 12:04:02 -07:00
e7edc55fff
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-04-29 12:03:58 -07:00
ff1883382e
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-04-29 12:03:50 -07:00
6edb312559
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-04-29 12:03:45 -07:00
8279f80885
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-04-29 12:03:18 -07:00
c708851b13
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-04-29 12:03:17 -07:00
3affbe6d7e
Update nvpair's to include nv_alloc_fixed support
2010-04-29 11:59:41 -07:00
c9ae4b9808
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-04-29 11:00:46 -07:00
8535236dca
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-04-29 11:00:45 -07:00
72de3a8ee1
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-04-29 11:00:44 -07:00
151f424dd8
Strip ident pragma from module/zfs/include/sys/fm/util.h
2010-04-29 10:57:17 -07:00
4d5d0f9ef5
Include FMA source and headers in build system
2010-04-29 10:55:27 -07:00
Brian Behlendorf