Brian Behlendorf
0d4d1a7861
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
...
Conflicts:
module/zfs/dsl_dataset.c
2010-05-28 13:52:52 -07:00
Brian Behlendorf
39f5f90c1a
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2010-05-28 13:52:29 -07:00
Brian Behlendorf
0c6ebd6b14
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2010-05-28 13:52:29 -07:00
Brian Behlendorf
24fc842bea
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2010-05-28 13:52:28 -07:00
Brian Behlendorf
0a7f819adf
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2010-05-28 13:52:28 -07:00
Brian Behlendorf
141b42bae9
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2010-05-28 13:52:28 -07:00
Brian Behlendorf
d9e977d23b
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2010-05-28 13:52:27 -07:00
Brian Behlendorf
64420d9573
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2010-05-28 13:52:27 -07:00
Brian Behlendorf
1a55aa78e7
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
...
Conflicts:
module/zfs/dnode.c
2010-05-28 13:52:23 -07:00
Brian Behlendorf
31630287ca
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
...
Conflicts:
lib/libzfs/libzfs_sendrecv.c
module/zfs/dmu_objset.c
module/zfs/dnode.c
module/zfs/dsl_dataset.c
module/zfs/spa_history.c
2010-05-28 13:51:29 -07:00
Brian Behlendorf
ab1a68b225
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
...
Conflicts:
module/zfs/dnode_sync.c
2010-05-28 13:46:45 -07:00
Brian Behlendorf
428870ff73
Update core ZFS code from build 121 to build 141.
2010-05-28 13:45:14 -07:00
Brian Behlendorf
65334acb7d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-28 12:46:10 -07:00
Brian Behlendorf
2c2cc18ae1
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-28 12:45:41 -07:00
Brian Behlendorf
3dc76b991d
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-05-28 12:45:41 -07:00
Brian Behlendorf
1d715125b6
Remove gcc-shadow from gcc-branch
2010-05-28 12:44:01 -07:00
Brian Behlendorf
6324adf280
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-28 12:43:01 -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
f838428eda
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-28 12:24:27 -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
ae685ebbd5
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-28 12:21:02 -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
354201bfb8
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-28 10:26:47 -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
5b621f7d08
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-28 10:16:59 -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
5ba0f3c2f1
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-28 10:03:02 -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
42ac623272
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-27 20:08:23 -07:00
Brian Behlendorf
e4d0d5c10c
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 20:06:10 -07:00