Brian Behlendorf
|
489fed3fc6
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-07-07 14:14:11 -07:00 |
|
Brian Behlendorf
|
f218c76396
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:14:01 -07:00 |
|
Brian Behlendorf
|
dd3f9c1ed4
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-07-07 14:13:57 -07:00 |
|
Brian Behlendorf
|
625d012da2
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:13:45 -07:00 |
|
Brian Behlendorf
|
f75b8648e2
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-07-07 14:13:43 -07:00 |
|
Brian Behlendorf
|
f15d7b53d6
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:13:33 -07:00 |
|
Brian Behlendorf
|
acf9b98673
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-07-07 14:13:30 -07:00 |
|
Brian Behlendorf
|
ed3b2fa86c
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:13:20 -07:00 |
|
Brian Behlendorf
|
014c16fb1f
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-07-07 14:13:16 -07:00 |
|
Brian Behlendorf
|
cab82772d3
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:13:05 -07:00 |
|
Brian Behlendorf
|
e945eb4fe1
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-07-07 14:13:02 -07:00 |
|
Brian Behlendorf
|
cd32991a2a
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:12:52 -07:00 |
|
Brian Behlendorf
|
c284220615
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-07-07 14:12:50 -07:00 |
|
Brian Behlendorf
|
a57ea67847
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:12:39 -07:00 |
|
Brian Behlendorf
|
46041d7761
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-07-07 14:12:35 -07:00 |
|
Brian Behlendorf
|
c682c2c2b7
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:12:25 -07:00 |
|
Brian Behlendorf
|
c62815ec2a
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-07-07 14:12:22 -07:00 |
|
Brian Behlendorf
|
7ffef68aed
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:12:12 -07:00 |
|
Brian Behlendorf
|
b024e97a09
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-07-07 14:12:10 -07:00 |
|
Brian Behlendorf
|
c2541a74a9
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:11:59 -07:00 |
|
Brian Behlendorf
|
8e7e41cfb0
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
Conflicts:
lib/libzfs/libzfs_dataset.c
|
2009-07-07 14:11:46 -07:00 |
|
Brian Behlendorf
|
6b850f73de
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:09:37 -07:00 |
|
Brian Behlendorf
|
1302d74a02
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-07-07 14:09:34 -07:00 |
|
Brian Behlendorf
|
8018d326e8
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-07-07 14:09:33 -07:00 |
|
Brian Behlendorf
|
0f97de9e19
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:09:14 -07:00 |
|
Brian Behlendorf
|
c911b60c46
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-07-07 14:09:12 -07:00 |
|
Brian Behlendorf
|
23f5686f20
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-07-07 14:09:10 -07:00 |
|
Brian Behlendorf
|
f26fe3f942
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:08:52 -07:00 |
|
Brian Behlendorf
|
158c91a0ef
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-07-07 14:08:47 -07:00 |
|
Brian Behlendorf
|
6a8fe624a6
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:08:37 -07:00 |
|
Brian Behlendorf
|
96ddc12975
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-07-07 14:08:35 -07:00 |
|
Brian Behlendorf
|
c6a51c6b70
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:08:24 -07:00 |
|
Brian Behlendorf
|
02bc7929d4
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-07-07 14:08:22 -07:00 |
|
Brian Behlendorf
|
7b41270731
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:08:11 -07:00 |
|
Brian Behlendorf
|
8e48c0b528
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-07-07 14:08:09 -07:00 |
|
Brian Behlendorf
|
367e5be613
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:07:59 -07:00 |
|
Brian Behlendorf
|
5f85f98b1b
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-07-07 14:07:56 -07:00 |
|
Brian Behlendorf
|
a35c772f7c
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-07-07 14:07:46 -07:00 |
|
Brian Behlendorf
|
7d68dde892
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-07-07 14:07:43 -07:00 |
|
Brian Behlendorf
|
1ff9c70da3
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:
lib/libzfs/libzfs_dataset.c
|
2009-07-07 14:04:47 -07:00 |
|
Brian Behlendorf
|
548a9d2813
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-07-07 13:50:34 -07:00 |
|
Brian Behlendorf
|
34422f0ffa
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-07-07 13:50:32 -07:00 |
|
Brian Behlendorf
|
47502cd94b
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-07-07 13:50:31 -07:00 |
|
Brian Behlendorf
|
1d8ef486a8
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-07-07 13:50:30 -07:00 |
|
Brian Behlendorf
|
fb26df15c8
|
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
|
2009-07-07 13:50:30 -07:00 |
|
Brian Behlendorf
|
cad9fa40e1
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2009-07-07 13:50:29 -07:00 |
|
Brian Behlendorf
|
a2423197e1
|
Resolve missing cast warning
|
2009-07-07 13:41:51 -07:00 |
|
Brian Behlendorf
|
361e0e7685
|
Fix newly introduced missing braces warnings for gcc.
|
2009-07-07 13:40:16 -07:00 |
|
Brian Behlendorf
|
ee92267c38
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-07-07 13:20:40 -07:00 |
|
Brian Behlendorf
|
9661d38088
|
Add topic branch to conditionally remove idmap support. The
only things currently like this on linux appears in the nfs v4
implementation of idmap. For now we can do with out.
|
2009-07-07 13:16:24 -07:00 |