Brian Behlendorf
|
ff09d64647
|
Pull all source in to be built, it will be ifdef'ed out as need by higher level topic branches
|
2009-01-09 14:37:45 -08:00 |
|
Brian Behlendorf
|
7b6040235d
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:30:32 -08:00 |
|
Brian Behlendorf
|
9ef637b057
|
Add minimum needed zvol bits
|
2009-01-09 14:28:50 -08:00 |
|
Brian Behlendorf
|
01aaf672af
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:19:26 -08:00 |
|
Brian Behlendorf
|
bd6fb32e4c
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-09 14:19:25 -08:00 |
|
Brian Behlendorf
|
36a09db792
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:19:21 -08:00 |
|
Brian Behlendorf
|
47381b0f82
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-09 14:19:20 -08:00 |
|
Brian Behlendorf
|
9c1b943436
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:19:17 -08:00 |
|
Brian Behlendorf
|
f47ce8aa02
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-09 14:19:16 -08:00 |
|
Brian Behlendorf
|
d76aaed0d3
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:19:12 -08:00 |
|
Brian Behlendorf
|
cdba663ce4
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-09 14:19:11 -08:00 |
|
Brian Behlendorf
|
67593be1d5
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:19:07 -08:00 |
|
Brian Behlendorf
|
9fe2f834ca
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-09 14:19:06 -08:00 |
|
Brian Behlendorf
|
4489c80ad2
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:19:03 -08:00 |
|
Brian Behlendorf
|
ec1b119f9a
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-09 14:19:01 -08:00 |
|
Brian Behlendorf
|
a7b36f7461
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:18:58 -08:00 |
|
Brian Behlendorf
|
3980e25e0f
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-09 14:18:57 -08:00 |
|
Brian Behlendorf
|
1d2d79c4e3
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:18:53 -08:00 |
|
Brian Behlendorf
|
f4ae82d019
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-09 14:18:52 -08:00 |
|
Brian Behlendorf
|
646c8b33e6
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:18:49 -08:00 |
|
Brian Behlendorf
|
ccb1f1c5d4
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-09 14:18:47 -08:00 |
|
Brian Behlendorf
|
682a997a0b
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:18:44 -08:00 |
|
Brian Behlendorf
|
5e7aec0a54
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-09 14:18:43 -08:00 |
|
Brian Behlendorf
|
8b470d7c04
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:18:39 -08:00 |
|
Brian Behlendorf
|
cb25e32a1c
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 14:18:38 -08:00 |
|
Brian Behlendorf
|
c4af3f4271
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:18:35 -08:00 |
|
Brian Behlendorf
|
36eeb5eeb2
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 14:18:34 -08:00 |
|
Brian Behlendorf
|
b55164f2cb
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 14:18:33 -08:00 |
|
Brian Behlendorf
|
4484a9c0bf
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:18:27 -08:00 |
|
Brian Behlendorf
|
f4bef22e4e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 14:18:26 -08:00 |
|
Brian Behlendorf
|
03a4aefbcf
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 14:18:25 -08:00 |
|
Brian Behlendorf
|
19190ab352
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:18:20 -08:00 |
|
Brian Behlendorf
|
d68de25ce4
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-09 14:18:18 -08:00 |
|
Brian Behlendorf
|
6c8320bd92
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:18:15 -08:00 |
|
Brian Behlendorf
|
e1401b00cf
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-09 14:18:13 -08:00 |
|
Brian Behlendorf
|
aa3521887a
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:18:10 -08:00 |
|
Brian Behlendorf
|
263a485f02
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-09 14:18:09 -08:00 |
|
Brian Behlendorf
|
c4d7330a87
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:18:05 -08:00 |
|
Brian Behlendorf
|
44711020bb
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-09 14:18:04 -08:00 |
|
Brian Behlendorf
|
78b2565c8c
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:18:01 -08:00 |
|
Brian Behlendorf
|
3519e128ba
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-09 14:18:00 -08:00 |
|
Brian Behlendorf
|
59340b70a7
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:17:56 -08:00 |
|
Brian Behlendorf
|
fd85c9b6fd
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-09 14:17:55 -08:00 |
|
Brian Behlendorf
|
1e181bcb77
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:17:52 -08:00 |
|
Brian Behlendorf
|
e17f9cb711
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-09 14:17:50 -08:00 |
|
Brian Behlendorf
|
6b32aaea67
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-09 14:17:49 -08:00 |
|
Brian Behlendorf
|
86eb46d20b
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-09 14:17:49 -08:00 |
|
Brian Behlendorf
|
0e3bb44848
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-01-09 14:17:48 -08:00 |
|
Brian Behlendorf
|
578c9645df
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-09 14:17:48 -08:00 |
|
Brian Behlendorf
|
902ce659b0
|
Fix c90 compliance issue
|
2009-01-09 14:15:56 -08:00 |