Brian Behlendorf
|
1a6c86bffe
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-10-23 12:27:58 -07:00 |
|
Brian Behlendorf
|
1c1d1a3fcb
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-10-23 12:27:56 -07:00 |
|
Brian Behlendorf
|
14126e76f0
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-10-23 12:27:50 -07:00 |
|
Brian Behlendorf
|
7c87446ab8
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-10-23 12:27:48 -07:00 |
|
Brian Behlendorf
|
12c261e3e3
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-10-23 12:27:42 -07:00 |
|
Brian Behlendorf
|
905511438f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-10-23 12:27:41 -07:00 |
|
Brian Behlendorf
|
9b253c7d02
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-10-23 12:27:35 -07:00 |
|
Brian Behlendorf
|
a80dbfac27
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-10-23 12:27:33 -07:00 |
|
Brian Behlendorf
|
035c422869
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-10-23 12:27:28 -07:00 |
|
Brian Behlendorf
|
96c5798564
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-10-23 12:27:26 -07:00 |
|
Brian Behlendorf
|
3d65c20fa9
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-10-23 12:27:25 -07:00 |
|
Brian Behlendorf
|
de4b36e469
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-10-23 12:27:16 -07:00 |
|
Brian Behlendorf
|
c66219eb6a
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-10-23 12:27:14 -07:00 |
|
Brian Behlendorf
|
d55c2a6511
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-10-23 12:27:13 -07:00 |
|
Brian Behlendorf
|
2f3b1e0416
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-10-23 12:27:04 -07:00 |
|
Brian Behlendorf
|
3c70cf68ca
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-10-23 12:27:02 -07:00 |
|
Brian Behlendorf
|
ea1f909ba2
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-10-23 12:26:56 -07:00 |
|
Brian Behlendorf
|
561015d399
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-10-23 12:26:54 -07:00 |
|
Brian Behlendorf
|
e61024445b
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-10-23 12:26:49 -07:00 |
|
Brian Behlendorf
|
b84f236a38
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-10-23 12:26:47 -07:00 |
|
Brian Behlendorf
|
a56b8d337f
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
Conflicts:
cmd/zfs/zfs_main.c
|
2009-10-23 12:25:33 -07:00 |
|
Brian Behlendorf
|
74b67983f1
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-10-23 12:24:39 -07:00 |
|
Brian Behlendorf
|
8d3be9d6b8
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-10-23 12:24:39 -07:00 |
|
Brian Behlendorf
|
edb22b6a3e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-10-23 12:24:38 -07:00 |
|
Brian Behlendorf
|
53fcde4a48
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-10-23 12:24:37 -07:00 |
|
Brian Behlendorf
|
d8d360724d
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2009-10-23 12:24:37 -07:00 |
|
Brian Behlendorf
|
5972702242
|
Add two more possible uninit vars flagged by gcc.
|
2009-10-23 11:43:09 -07:00 |
|
Brian Behlendorf
|
a9db62de88
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-10-21 12:04:40 -07:00 |
|
Brian Behlendorf
|
7f36c8649f
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-10-21 12:04:39 -07:00 |
|
Brian Behlendorf
|
75d3938961
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-10-21 12:04:36 -07:00 |
|
Brian Behlendorf
|
89639638d6
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-10-21 12:04:36 -07:00 |
|
Brian Behlendorf
|
bfddec1957
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-10-21 12:04:33 -07:00 |
|
Brian Behlendorf
|
8545c1c447
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-10-21 12:04:32 -07:00 |
|
Brian Behlendorf
|
42ac9f4511
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-10-21 12:04:29 -07:00 |
|
Brian Behlendorf
|
22e096636f
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-10-21 12:04:28 -07:00 |
|
Brian Behlendorf
|
d3f63b9657
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-10-21 12:04:26 -07:00 |
|
Brian Behlendorf
|
151bb2689e
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-10-21 12:04:25 -07:00 |
|
Brian Behlendorf
|
8513e824a0
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-10-21 12:04:22 -07:00 |
|
Brian Behlendorf
|
b1d8d8fef9
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-10-21 12:04:21 -07:00 |
|
Brian Behlendorf
|
e0e0bac5a6
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-10-21 12:04:19 -07:00 |
|
Brian Behlendorf
|
6367f93602
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-10-21 12:04:18 -07:00 |
|
Brian Behlendorf
|
c9e138c366
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-10-21 12:04:15 -07:00 |
|
Brian Behlendorf
|
044a19c1bf
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-10-21 12:04:14 -07:00 |
|
Brian Behlendorf
|
cbe8cd5465
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-10-21 12:04:11 -07:00 |
|
Brian Behlendorf
|
f1f05eacf1
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-10-21 12:04:11 -07:00 |
|
Brian Behlendorf
|
99a081f0f7
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-10-21 12:04:08 -07:00 |
|
Brian Behlendorf
|
3e32c771b0
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-10-21 12:04:07 -07:00 |
|
Brian Behlendorf
|
deaca125bd
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-10-21 12:04:04 -07:00 |
|
Brian Behlendorf
|
7dc8d8e947
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-10-21 12:04:03 -07:00 |
|
Brian Behlendorf
|
f0aac45aa5
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-10-21 12:04:01 -07:00 |