Brian Behlendorf
|
3bc5ef54a8
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-15 16:34:18 -08:00 |
|
Brian Behlendorf
|
7c8ca1d516
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-15 16:34:13 -08:00 |
|
Brian Behlendorf
|
91c29d4451
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-15 16:34:04 -08:00 |
|
Brian Behlendorf
|
48e716093d
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-15 16:33:59 -08:00 |
|
Brian Behlendorf
|
599cb4508c
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-15 16:33:52 -08:00 |
|
Brian Behlendorf
|
cf15da53e5
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-15 16:33:46 -08:00 |
|
Brian Behlendorf
|
e6e2cc4648
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-15 16:33:40 -08:00 |
|
Brian Behlendorf
|
371bfbbdc9
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-15 16:33:35 -08:00 |
|
Brian Behlendorf
|
a8b728e2bc
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-15 16:33:27 -08:00 |
|
Brian Behlendorf
|
42b3648e0b
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-15 16:33:22 -08:00 |
|
Brian Behlendorf
|
3f6d252a47
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-15 16:33:14 -08:00 |
|
Brian Behlendorf
|
8ff964a4f3
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-15 16:33:09 -08:00 |
|
Brian Behlendorf
|
a078e1c961
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-15 16:33:00 -08:00 |
|
Brian Behlendorf
|
93308c3507
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-15 16:32:56 -08:00 |
|
Brian Behlendorf
|
752d126dae
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-15 16:32:48 -08:00 |
|
Brian Behlendorf
|
56b47e5767
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-15 16:32:42 -08:00 |
|
Brian Behlendorf
|
bfc3f50b40
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-15 16:32:34 -08:00 |
|
Brian Behlendorf
|
f1300cddb7
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-15 16:32:30 -08:00 |
|
Brian Behlendorf
|
f33c13d11d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-15 16:32:27 -08:00 |
|
Brian Behlendorf
|
a0e349f696
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-15 16:32:14 -08:00 |
|
Brian Behlendorf
|
c090c8b1aa
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-15 16:32:10 -08:00 |
|
Brian Behlendorf
|
41cba9f136
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-15 16:32:08 -08:00 |
|
Brian Behlendorf
|
196079ff75
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-15 16:31:56 -08:00 |
|
Brian Behlendorf
|
42033b5a29
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-15 16:31:51 -08:00 |
|
Brian Behlendorf
|
ab6a2038a3
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-15 16:31:43 -08:00 |
|
Brian Behlendorf
|
9ecb40af61
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-15 16:31:37 -08:00 |
|
Brian Behlendorf
|
477e494802
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-15 16:31:29 -08:00 |
|
Brian Behlendorf
|
335ef730ce
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-15 16:31:25 -08:00 |
|
Brian Behlendorf
|
e7af9b5ef7
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-15 16:31:16 -08:00 |
|
Brian Behlendorf
|
ddad4896d6
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-15 16:31:11 -08:00 |
|
Brian Behlendorf
|
14539fdafa
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-15 16:31:03 -08:00 |
|
Brian Behlendorf
|
ea2c8a4e37
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-15 16:30:58 -08:00 |
|
Brian Behlendorf
|
967a86dc8e
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-15 16:30:50 -08:00 |
|
Brian Behlendorf
|
bcbc221174
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-15 16:30:45 -08:00 |
|
Brian Behlendorf
|
37cc2cedde
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-15 16:30:38 -08:00 |
|
Brian Behlendorf
|
b8e5edb299
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-15 16:30:32 -08:00 |
|
Brian Behlendorf
|
fb256294c9
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-15 16:30:29 -08:00 |
|
Brian Behlendorf
|
c5b335f613
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-15 16:30:28 -08:00 |
|
Brian Behlendorf
|
68be1291b7
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-01-15 16:30:26 -08:00 |
|
Brian Behlendorf
|
31cddc8a0b
|
Merge branch 'fix-locks' into refs/top-bases/fix-branch
|
2009-01-15 16:30:25 -08:00 |
|
Brian Behlendorf
|
50186c2b57
|
All init and destroy initialized pulled in
|
2009-01-15 16:25:25 -08:00 |
|
Brian Behlendorf
|
7d4fe54632
|
txg_init/txg_fini cv_* initialized pulled in upstream in a slightly different way, drop these now redundant versions
|
2009-01-15 16:22:23 -08:00 |
|
Brian Behlendorf
|
96093f7774
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-01-15 15:56:34 -08:00 |
|
Brian Behlendorf
|
94b307675f
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-01-15 15:56:32 -08:00 |
|
Brian Behlendorf
|
4f715bee61
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-01-15 15:56:30 -08:00 |
|
Brian Behlendorf
|
7e88239dba
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-15 15:56:27 -08:00 |
|
Brian Behlendorf
|
b53602e7c0
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-15 15:56:25 -08:00 |
|
Brian Behlendorf
|
78d8394285
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-15 15:56:22 -08:00 |
|
Brian Behlendorf
|
58d8407826
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-15 15:56:20 -08:00 |
|
Brian Behlendorf
|
e98367cdb0
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-15 15:56:16 -08:00 |