Brian Behlendorf
|
35402a2780
|
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
|
2009-08-18 12:09:16 -07:00 |
Brian Behlendorf
|
b330ab77df
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2009-08-18 12:09:14 -07:00 |
Brian Behlendorf
|
d205b25a74
|
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
|
2009-08-18 12:09:10 -07:00 |
Brian Behlendorf
|
25ddaec292
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2009-08-18 12:09:07 -07:00 |
Brian Behlendorf
|
b99b422796
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-08-18 12:08:58 -07:00 |
Brian Behlendorf
|
88531ad82b
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-08-18 12:08:56 -07:00 |
Brian Behlendorf
|
9f5c891fb1
|
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
|
2009-08-18 12:08:53 -07:00 |
Brian Behlendorf
|
cadd2ec869
|
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
|
2009-08-18 12:08:52 -07:00 |
Brian Behlendorf
|
1d7551423a
|
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
|
2009-08-18 12:08:47 -07:00 |
Brian Behlendorf
|
41b297a27f
|
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
|
2009-08-18 12:08:46 -07:00 |
Brian Behlendorf
|
dc2aa83adf
|
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
|
2009-08-18 12:08:41 -07:00 |
Brian Behlendorf
|
abd8fdb94f
|
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
Conflicts:
module/zfs/dsl_deleg.c
module/zfs/rrwlock.c
|
2009-08-18 12:08:36 -07:00 |
Brian Behlendorf
|
80785b829e
|
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
|
2009-08-18 12:07:41 -07:00 |
Brian Behlendorf
|
9d2ca4a4d4
|
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
|
2009-08-18 12:07:40 -07:00 |
Brian Behlendorf
|
c0cef09b7e
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2009-08-18 12:07:35 -07:00 |
Brian Behlendorf
|
db89339134
|
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
Conflicts:
module/zfs/dmu.c
|
2009-08-18 12:07:23 -07:00 |
Brian Behlendorf
|
b760445ff5
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2009-08-18 12:06:54 -07:00 |
Brian Behlendorf
|
3a37442dc7
|
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
|
2009-08-18 12:06:53 -07:00 |
Brian Behlendorf
|
50d2c65daf
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2009-08-18 12:06:48 -07:00 |
Brian Behlendorf
|
c5b5d32d69
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
Conflicts:
module/zfs/vdev_raidz.c
|
2009-08-18 12:06:21 -07:00 |
Brian Behlendorf
|
268e04166d
|
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
|
2009-08-18 12:05:40 -07:00 |
Brian Behlendorf
|
481225606c
|
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
|
2009-08-18 12:05:39 -07:00 |
Brian Behlendorf
|
387821c409
|
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
|
2009-08-18 12:05:34 -07:00 |
Brian Behlendorf
|
e95fcbffd9
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2009-08-18 12:05:33 -07:00 |
Brian Behlendorf
|
ff0406ccc5
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2009-08-18 12:05:28 -07:00 |
Brian Behlendorf
|
38cc41b5fe
|
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
|
2009-08-18 12:05:26 -07:00 |
Brian Behlendorf
|
4a4de1cc99
|
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
|
2009-08-18 12:05:22 -07:00 |
Brian Behlendorf
|
bb286fe763
|
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
|
2009-08-18 12:05:20 -07:00 |
Brian Behlendorf
|
012cc31598
|
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
|
2009-08-18 12:05:17 -07:00 |
Brian Behlendorf
|
c3a6c4afba
|
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
|
2009-08-18 12:05:13 -07:00 |
Brian Behlendorf
|
4b1b3d2498
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2009-08-18 12:05:09 -07:00 |
Brian Behlendorf
|
9e903015fd
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2009-08-18 12:05:07 -07:00 |
Brian Behlendorf
|
e5e4fadc34
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Conflicts:
module/zfs/dmu.c
module/zfs/dsl_deleg.c
module/zfs/rrwlock.c
module/zfs/vdev_raidz.c
|
2009-08-18 12:04:53 -07:00 |
Brian Behlendorf
|
0f80e41c89
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Conflicts:
module/zfs/spa_misc.c
module/zfs/vdev_label.c
|
2009-08-18 11:55:36 -07:00 |
Brian Behlendorf
|
45d1cae3b8
|
Rebase master to b121
|
2009-08-18 11:43:27 -07:00 |
Brian Behlendorf
|
2a5509bf2e
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-08-18 11:24:26 -07:00 |
Brian Behlendorf
|
a8571c405a
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-08-18 11:24:17 -07:00 |
Brian Behlendorf
|
9f0f023501
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-08-18 11:24:07 -07:00 |
Brian Behlendorf
|
c5a8c8a22f
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-08-18 11:23:54 -07:00 |
Brian Behlendorf
|
d7b205d29e
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-08-18 11:23:46 -07:00 |
Brian Behlendorf
|
0be3c540b5
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-08-18 11:23:36 -07:00 |
Brian Behlendorf
|
b1493a422a
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-08-18 11:23:26 -07:00 |
Brian Behlendorf
|
cfa3e7ca30
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-08-18 11:23:14 -07:00 |
Brian Behlendorf
|
721e19ae88
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-08-18 11:23:05 -07:00 |
Brian Behlendorf
|
17f141f611
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-08-18 11:22:56 -07:00 |
Brian Behlendorf
|
5da177d77c
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-08-18 11:22:45 -07:00 |
Brian Behlendorf
|
9902370261
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-08-18 11:22:31 -07:00 |
Brian Behlendorf
|
a5c29136a8
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-08-18 11:22:23 -07:00 |
Brian Behlendorf
|
bf31be60c6
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-08-18 11:22:06 -07:00 |
Brian Behlendorf
|
ea65695c30
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-08-18 11:21:47 -07:00 |