Brian Behlendorf
|
9d2f4fe554
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-03-16 16:21:36 -07:00 |
|
Brian Behlendorf
|
2c5de77eae
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-03-16 16:21:33 -07:00 |
|
Brian Behlendorf
|
0456486d71
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-03-16 16:21:17 -07:00 |
|
Brian Behlendorf
|
b7f6b6e19d
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-03-16 16:21:15 -07:00 |
|
Brian Behlendorf
|
75cd2ee450
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-16 16:21:03 -07:00 |
|
Brian Behlendorf
|
4bcfe17f4d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-03-16 16:21:00 -07:00 |
|
Brian Behlendorf
|
739046cc70
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-03-16 16:20:48 -07:00 |
|
Brian Behlendorf
|
c72f5112d3
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-03-16 16:20:45 -07:00 |
|
Brian Behlendorf
|
2eeb44f401
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-03-16 16:20:32 -07:00 |
|
Brian Behlendorf
|
f7087f0431
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-16 16:20:30 -07:00 |
|
Brian Behlendorf
|
f073f197bc
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-16 16:20:29 -07:00 |
|
Brian Behlendorf
|
ea30b67b65
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-03-16 16:20:05 -07:00 |
|
Brian Behlendorf
|
7ca5472963
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-03-16 16:20:03 -07:00 |
|
Brian Behlendorf
|
5edabb999f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-16 16:20:02 -07:00 |
|
Brian Behlendorf
|
1ad88b0c94
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-03-16 16:19:37 -07:00 |
|
Brian Behlendorf
|
6639b29332
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-03-16 16:19:35 -07:00 |
|
Brian Behlendorf
|
de1f21e3e5
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-03-16 16:19:23 -07:00 |
|
Brian Behlendorf
|
990500b8a2
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-03-16 16:19:21 -07:00 |
|
Brian Behlendorf
|
774b33ed54
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-03-16 16:19:05 -07:00 |
|
Brian Behlendorf
|
85f5512989
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-03-16 16:19:03 -07:00 |
|
Brian Behlendorf
|
fa638715c7
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-03-16 16:18:50 -07:00 |
|
Brian Behlendorf
|
467a8283c4
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-03-16 16:18:48 -07:00 |
|
Brian Behlendorf
|
1dd5635e99
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-03-16 16:18:33 -07:00 |
|
Brian Behlendorf
|
11d99f4112
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-03-16 16:18:27 -07:00 |
|
Brian Behlendorf
|
46ed35aada
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-03-16 16:18:15 -07:00 |
|
Brian Behlendorf
|
6cf0a454f0
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-03-16 16:18:13 -07:00 |
|
Brian Behlendorf
|
f28a31a09a
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-03-16 16:18:01 -07:00 |
|
Brian Behlendorf
|
61926abf0f
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-03-16 16:17:58 -07:00 |
|
Brian Behlendorf
|
df985d53db
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-03-16 16:17:57 -07:00 |
|
Brian Behlendorf
|
24ea8a1d2a
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-03-16 16:17:55 -07:00 |
|
Brian Behlendorf
|
f86b52a39d
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-03-16 16:17:55 -07:00 |
|
Brian Behlendorf
|
3eebe1bd0e
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2009-03-16 16:17:54 -07:00 |
|
Brian Behlendorf
|
3eb4ba3ebd
|
Add 3 more uninit errors detected by gcc 3.4.0 compiler.
|
2009-03-16 16:06:50 -07:00 |
|
Brian Behlendorf
|
709c447ce6
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-03-16 11:41:18 -07:00 |
|
Brian Behlendorf
|
7bca8f1926
|
Use vmem_size() only on i386 systems and in the kernel.
|
2009-03-16 11:27:26 -07:00 |
|
Brian Behlendorf
|
af0afd9ce3
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-03-16 11:24:10 -07:00 |
|
Brian Behlendorf
|
53edd221ff
|
Pull unused get_one_dataset() under HAVE_ZPL ifdef.
|
2009-03-16 11:14:19 -07:00 |
|
Brian Behlendorf
|
75e36e028f
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-03-16 10:43:36 -07:00 |
|
Brian Behlendorf
|
a4f629ec9d
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-03-16 10:43:34 -07:00 |
|
Brian Behlendorf
|
ec9782ea5a
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-03-16 10:43:22 -07:00 |
|
Brian Behlendorf
|
cddaf29902
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-03-16 10:43:19 -07:00 |
|
Brian Behlendorf
|
4b0d59bd9b
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-03-16 10:43:09 -07:00 |
|
Brian Behlendorf
|
389c6947b4
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-03-16 10:43:07 -07:00 |
|
Brian Behlendorf
|
c3a08beab5
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-03-16 10:42:57 -07:00 |
|
Brian Behlendorf
|
ac0ed2b141
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-03-16 10:42:55 -07:00 |
|
Brian Behlendorf
|
888ef2d4f3
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-03-16 10:42:45 -07:00 |
|
Brian Behlendorf
|
754431f4db
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-03-16 10:42:43 -07:00 |
|
Brian Behlendorf
|
9062f8b29f
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-16 10:42:32 -07:00 |
|
Brian Behlendorf
|
10e245f03f
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
Conflicts:
cmd/zpool/zpool_main.c
|
2009-03-16 10:42:20 -07:00 |
|
Brian Behlendorf
|
d4ae135756
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-03-16 10:41:32 -07:00 |