Brian Behlendorf
|
688aff8f98
|
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
Conflicts:
cmd/ztest/ztest.c
module/zfs/include/sys/zfs_znode.h
|
2010-05-28 14:30:54 -07:00 |
|
Brian Behlendorf
|
0c35ee68a3
|
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
Conflicts:
cmd/zfs/zfs_util.h
cmd/zinject/zinject.h
cmd/zpool/zpool_util.c
lib/libnvpair/include/libnvpair.h
lib/libnvpair/libnvpair.c
lib/libzfs/libzfs_config.c
lib/libzfs/libzfs_import.c
module/avl/avl.c
module/avl/include/sys/avl.h
module/nvpair/include/sys/nvpair.h
module/nvpair/nvpair.c
module/zcommon/include/zfs_comutil.h
module/zcommon/include/zfs_prop.h
module/zcommon/zfs_comutil.c
module/zfs/dmu_zfetch.c
module/zfs/dsl_synctask.c
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/dmu_zfetch.h
module/zfs/include/sys/dsl_synctask.h
module/zfs/include/sys/refcount.h
module/zfs/include/sys/txg.h
module/zfs/include/sys/uberblock.h
module/zfs/include/sys/zap_leaf.h
module/zfs/include/sys/zfs_debug.h
module/zfs/include/sys/zio_compress.h
module/zfs/include/sys/zvol.h
module/zfs/lzjb.c
module/zfs/refcount.c
module/zfs/sha256.c
module/zfs/spa_boot.c
module/zfs/uberblock.c
module/zfs/zfs_replay.c
module/zfs/zio_compress.c
|
2010-05-28 14:28:49 -07:00 |
|
Brian Behlendorf
|
957b7b41d4
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Conflicts:
cmd/zdb/zdb.c
cmd/ztest/ztest.c
module/zfs/dbuf.c
module/zfs/dsl_dataset.c
module/zfs/dsl_scrub.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zio.c
|
2010-05-28 14:19:22 -07:00 |
|
Brian Behlendorf
|
b80e7c8069
|
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
|
2010-05-28 13:54:54 -07:00 |
|
Brian Behlendorf
|
2d4cd584e7
|
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
|
2010-05-28 13:54:54 -07:00 |
|
Brian Behlendorf
|
2de855c46f
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2010-05-28 13:54:54 -07:00 |
|
Brian Behlendorf
|
877bb02a78
|
Merge commit 'refs/top-bases/fix-acl' into fix-acl
|
2010-05-28 13:54:53 -07:00 |
|
Brian Behlendorf
|
f6df7f8782
|
Merge branch 'fix-acl' into refs/top-bases/fix-branch
|
2010-05-28 13:54:53 -07:00 |
|
Brian Behlendorf
|
683c459a72
|
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
|
2010-05-28 13:54:53 -07:00 |
|
Brian Behlendorf
|
2b40ca1456
|
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
|
2010-05-28 13:54:52 -07:00 |
|
Brian Behlendorf
|
0f28de26db
|
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
|
2010-05-28 13:54:52 -07:00 |
|
Brian Behlendorf
|
6c1f1ca76b
|
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
Conflicts:
lib/libzfs/libzfs_sendrecv.c
|
2010-05-28 13:54:49 -07:00 |
|
Brian Behlendorf
|
0c7850b688
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2010-05-28 13:54:13 -07:00 |
|
Brian Behlendorf
|
016808b9e9
|
Merge commit 'refs/top-bases/fix-list' into fix-list
|
2010-05-28 13:54:12 -07:00 |
|
Brian Behlendorf
|
2c67a5a29d
|
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
|
2010-05-28 13:54:12 -07:00 |
|
Brian Behlendorf
|
c53061c5af
|
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
|
2010-05-28 13:54:12 -07:00 |
|
Brian Behlendorf
|
4bcccd352e
|
Merge branch 'fix-stack' into refs/top-bases/fix-branch
|
2010-05-28 13:54:11 -07:00 |
|
Brian Behlendorf
|
89089d1e4b
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
Conflicts:
module/zfs/dmu_objset.c
module/zfs/spa_history.c
|
2010-05-28 13:54:08 -07:00 |
|
Brian Behlendorf
|
be688941e5
|
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
|
2010-05-28 13:52:55 -07:00 |
|
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
|
bcfe72108d
|
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:46:13 -07:00 |
|
Brian Behlendorf
|
6807f4d1e5
|
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
|
2010-05-28 12:46:12 -07:00 |
|
Brian Behlendorf
|
dce948dcc3
|
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:46:11 -07:00 |
|
Brian Behlendorf
|
edafb16564
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2010-05-28 12:46:10 -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
|
dbe2da764f
|
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:46:07 -07:00 |
|
Brian Behlendorf
|
73bbb3ad55
|
Merge commit 'refs/top-bases/linux-events' into linux-events
|
2010-05-28 12:46:06 -07:00 |
|
Brian Behlendorf
|
9c12fdf378
|
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:46:05 -07:00 |
|
Brian Behlendorf
|
82fd89630d
|
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
|
2010-05-28 12:46:04 -07:00 |
|
Brian Behlendorf
|
87dc15d723
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2010-05-28 12:46:02 -07:00 |
|
Brian Behlendorf
|
6e34d7f2f0
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:46:02 -07:00 |
|
Brian Behlendorf
|
d1050a3a50
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2010-05-28 12:46:00 -07:00 |
|
Brian Behlendorf
|
d55a3f122c
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:46:00 -07:00 |
|
Brian Behlendorf
|
9f3a0bd60c
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2010-05-28 12:45:58 -07:00 |
|
Brian Behlendorf
|
a9f9d3a478
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:45:58 -07:00 |
|
Brian Behlendorf
|
56cd97b016
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2010-05-28 12:45:56 -07:00 |
|
Brian Behlendorf
|
de41de444f
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:45:56 -07:00 |
|
Brian Behlendorf
|
2a239668c2
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2010-05-28 12:45:54 -07:00 |
|
Brian Behlendorf
|
755c1dbfa9
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2010-05-28 12:45:54 -07:00 |