Brian Behlendorf
|
96cd1ebed4
|
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
|
2008-12-10 12:45:26 -08:00 |
|
Brian Behlendorf
|
c30141ac2e
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2008-12-10 12:45:25 -08:00 |
|
Brian Behlendorf
|
cea3a92356
|
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
|
2008-12-10 12:45:23 -08:00 |
|
Brian Behlendorf
|
bbb1a0ebaf
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2008-12-10 12:45:22 -08:00 |
|
Brian Behlendorf
|
7d4c8081ae
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-10 12:45:17 -08:00 |
|
Brian Behlendorf
|
17ad7b7431
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-10 12:45:16 -08:00 |
|
Brian Behlendorf
|
79163293c0
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2008-12-10 12:45:15 -08:00 |
|
Brian Behlendorf
|
8790fcdfdf
|
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
|
2008-12-10 12:45:14 -08:00 |
|
Brian Behlendorf
|
0832cb4651
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2008-12-10 12:45:12 -08:00 |
|
Brian Behlendorf
|
91b3faebcb
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2008-12-10 12:45:11 -08:00 |
|
Brian Behlendorf
|
f1fd8b8d56
|
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
|
2008-12-10 12:45:09 -08:00 |
|
Brian Behlendorf
|
1a035f19ac
|
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
|
2008-12-10 12:45:08 -08:00 |
|
Brian Behlendorf
|
5137b305eb
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2008-12-10 12:45:05 -08:00 |
|
Brian Behlendorf
|
2811b02a21
|
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
|
2008-12-10 12:45:05 -08:00 |
|
Brian Behlendorf
|
c68ff2b993
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-10 12:45:02 -08:00 |
|
Brian Behlendorf
|
6203c7e50f
|
Removed file
|
2008-12-10 12:45:00 -08:00 |
|
Brian Behlendorf
|
57fc00a3ab
|
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
|
2008-12-10 12:44:49 -08:00 |
|
Brian Behlendorf
|
1afc1fdff6
|
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
|
2008-12-10 12:44:48 -08:00 |
|
Brian Behlendorf
|
7a683e0798
|
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
|
2008-12-10 12:44:45 -08:00 |
|
Brian Behlendorf
|
c09cf7f5a8
|
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
|
2008-12-10 12:44:44 -08:00 |
|
Brian Behlendorf
|
c054595fa5
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-10 12:44:42 -08:00 |
|
Brian Behlendorf
|
ae3da3aecc
|
Removed file
|
2008-12-10 12:44:40 -08:00 |
|
Brian Behlendorf
|
19921e591e
|
Removed file
|
2008-12-10 12:44:08 -08:00 |
|
Brian Behlendorf
|
1b59a53bf5
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-10 12:43:44 -08:00 |
|
Brian Behlendorf
|
9e8b1e836c
|
Remove libumem, we will try and remove this dependency entirely. If we can't then the best move will simply be to use the official library, or build it as a convenience library
|
2008-12-10 12:43:20 -08:00 |
|
Brian Behlendorf
|
4f9a123613
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-10 12:01:19 -08:00 |
|
Brian Behlendorf
|
39efcfdcd0
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:01:14 -08:00 |
|
Brian Behlendorf
|
9f40c017ae
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-10 12:01:10 -08:00 |
|
Brian Behlendorf
|
04ab135544
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:01:06 -08:00 |
|
Brian Behlendorf
|
9c6c2cb92f
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-10 12:01:04 -08:00 |
|
Brian Behlendorf
|
239c088c95
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:01:00 -08:00 |
|
Brian Behlendorf
|
823fcc8da4
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-10 12:00:58 -08:00 |
|
Brian Behlendorf
|
455c83ea5d
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:00:54 -08:00 |
|
Brian Behlendorf
|
c889e50d1f
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-10 12:00:52 -08:00 |
|
Brian Behlendorf
|
5c887c65f6
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:00:49 -08:00 |
|
Brian Behlendorf
|
2db09f9c6b
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-10 12:00:47 -08:00 |
|
Brian Behlendorf
|
a36365feb6
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:00:43 -08:00 |
|
Brian Behlendorf
|
2d658f2d9d
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-10 12:00:41 -08:00 |
|
Brian Behlendorf
|
d4fe007d94
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:00:37 -08:00 |
|
Brian Behlendorf
|
bf280fb033
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-10 12:00:36 -08:00 |
|
Brian Behlendorf
|
f48ff68ac1
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:00:32 -08:00 |
|
Brian Behlendorf
|
2aac31bb0a
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-10 12:00:30 -08:00 |
|
Brian Behlendorf
|
eeceb7c595
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:00:26 -08:00 |
|
Brian Behlendorf
|
1d3770b4b7
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-10 12:00:24 -08:00 |
|
Brian Behlendorf
|
54a3ab135a
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:00:21 -08:00 |
|
Brian Behlendorf
|
2eb6fa8f1c
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-10 12:00:19 -08:00 |
|
Brian Behlendorf
|
be970e80d8
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:00:16 -08:00 |
|
Brian Behlendorf
|
5cb66ff8d5
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-10 12:00:14 -08:00 |
|
Brian Behlendorf
|
deeb049ae2
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-10 12:00:13 -08:00 |
|
Brian Behlendorf
|
b8aeade61b
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-10 12:00:07 -08:00 |