Brian Behlendorf
|
079eedfaf9
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-03-11 11:15:12 -07:00 |
|
Brian Behlendorf
|
bf200630f9
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:
module/zfs/rrwlock.c
module/zfs/spa_boot.c
module/zfs/zfs_replay.c
|
2009-03-11 11:12:24 -07:00 |
|
Brian Behlendorf
|
c143e6e5b9
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-03-11 11:09:18 -07:00 |
|
Brian Behlendorf
|
dff484a388
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-03-11 11:09:13 -07:00 |
|
Brian Behlendorf
|
5f30a3cb0e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-03-11 11:09:11 -07:00 |
|
Brian Behlendorf
|
57b10339b3
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-03-11 11:00:45 -07:00 |
|
Brian Behlendorf
|
8fe801fd8f
|
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
|
2009-03-11 11:00:42 -07:00 |
|
Brian Behlendorf
|
faa3499f83
|
New TopGit dependency: gcc-ident-pragmas
|
2009-03-11 11:00:39 -07:00 |
Ricardo M. Correia
|
af45030850
|
Added 'gcc-ident-pragmas' branch.
|
2009-03-11 10:59:45 -07:00 |
|
Brian Behlendorf
|
0c8622c47c
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-03-11 10:55:05 -07:00 |
|
Ricardo M. Correia
|
4a118b6227
|
Minor bug fix due to MAXOFFSET_T constant being too large on 32-bit systems.
|
2009-03-11 10:47:20 -07:00 |
|
Brian Behlendorf
|
ce131fe6cf
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-03-11 10:45:04 -07:00 |
|
Brian Behlendorf
|
ab3f1d72e8
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-03-11 10:45:02 -07:00 |
|
Brian Behlendorf
|
930998006d
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-03-11 10:44:53 -07:00 |
|
Brian Behlendorf
|
2ff4ee3cae
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-03-11 10:44:51 -07:00 |
|
Brian Behlendorf
|
0bf363dd2f
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-03-11 10:44:40 -07:00 |
|
Brian Behlendorf
|
f4b41f3a6c
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-03-11 10:44:36 -07:00 |
|
Brian Behlendorf
|
7917a63148
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-03-11 10:44:27 -07:00 |
|
Brian Behlendorf
|
6d747ae039
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-03-11 10:44:25 -07:00 |
|
Brian Behlendorf
|
9040485f63
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-03-11 10:44:12 -07:00 |
|
Brian Behlendorf
|
2d756b5ea3
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-03-11 10:44:10 -07:00 |
|
Brian Behlendorf
|
5cb339a4d5
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-11 10:44:01 -07:00 |
|
Brian Behlendorf
|
2be3b720b9
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-03-11 10:43:59 -07:00 |
|
Brian Behlendorf
|
c01fdef0d3
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-03-11 10:43:49 -07:00 |
|
Brian Behlendorf
|
ab79e1e996
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-03-11 10:43:47 -07:00 |
|
Brian Behlendorf
|
cc47528138
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-03-11 10:43:35 -07:00 |
|
Brian Behlendorf
|
54f8171e06
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-03-11 10:43:33 -07:00 |
|
Brian Behlendorf
|
ac1b59cb3d
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-03-11 10:43:24 -07:00 |
|
Brian Behlendorf
|
a6e33547be
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-03-11 10:43:20 -07:00 |
|
Brian Behlendorf
|
11feaf3d5f
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-11 10:43:11 -07:00 |
|
Brian Behlendorf
|
4f57a6ccb6
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-03-11 10:43:09 -07:00 |
|
Brian Behlendorf
|
6f17b4e190
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-03-11 10:42:59 -07:00 |
|
Brian Behlendorf
|
a032eaff34
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-03-11 10:42:57 -07:00 |
|
Brian Behlendorf
|
fa969b2234
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-03-11 10:42:45 -07:00 |
|
Brian Behlendorf
|
da73d85b15
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-03-11 10:42:43 -07:00 |
|
Brian Behlendorf
|
d26a93c0f8
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-03-11 10:42:33 -07:00 |
|
Brian Behlendorf
|
a3da614c79
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-11 10:42:31 -07:00 |
|
Brian Behlendorf
|
4231a48b17
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-11 10:42:30 -07:00 |
|
Brian Behlendorf
|
df19cfa516
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-03-11 10:42:13 -07:00 |
|
Brian Behlendorf
|
5f4e78b6cc
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-03-11 10:42:10 -07:00 |
|
Brian Behlendorf
|
5067076033
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-11 10:42:09 -07:00 |
|
Brian Behlendorf
|
2706c0885e
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-03-11 10:41:52 -07:00 |
|
Brian Behlendorf
|
9dca58253e
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-03-11 10:41:48 -07:00 |
|
Brian Behlendorf
|
7c71ac9bf5
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-03-11 10:41:37 -07:00 |
|
Brian Behlendorf
|
ba9f24e37c
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-03-11 10:41:36 -07:00 |
|
Brian Behlendorf
|
219d095f99
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-03-11 10:41:26 -07:00 |
|
Brian Behlendorf
|
e42874df99
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-03-11 10:41:25 -07:00 |
|
Brian Behlendorf
|
4ea2076338
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-03-11 10:41:13 -07:00 |
|
Brian Behlendorf
|
762bbd3368
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-03-11 10:41:10 -07:00 |
|
Brian Behlendorf
|
377cc29902
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-03-11 10:41:01 -07:00 |