Brian Behlendorf
|
73db9f622c
|
Pull unused err variable under HAVE_DM_INUSE_SWAP ifdef.
|
2009-03-11 23:05:42 -07:00 |
|
Brian Behlendorf
|
06fd9e48a0
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-03-11 23:00:04 -07:00 |
|
Brian Behlendorf
|
8aac8753f4
|
Move 4 unused functions under HAVE_ZPL until implemented.
|
2009-03-11 22:55:45 -07:00 |
|
Brian Behlendorf
|
df86f94c91
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-03-11 22:50:38 -07:00 |
|
Brian Behlendorf
|
785f416420
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-03-11 22:50:36 -07:00 |
|
Brian Behlendorf
|
0d19b2613b
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-03-11 22:50:31 -07:00 |
|
Brian Behlendorf
|
7dda95296c
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-03-11 22:50:29 -07:00 |
|
Brian Behlendorf
|
34e741934d
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-03-11 22:50:23 -07:00 |
|
Brian Behlendorf
|
b5a8a9b849
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-03-11 22:50:21 -07:00 |
|
Brian Behlendorf
|
5fdf7cba2c
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-03-11 22:50:16 -07:00 |
|
Brian Behlendorf
|
267ddd3d1d
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-03-11 22:50:13 -07:00 |
|
Brian Behlendorf
|
7e02741bb3
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-03-11 22:50:04 -07:00 |
|
Brian Behlendorf
|
ef003a41c3
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-03-11 22:50:02 -07:00 |
|
Brian Behlendorf
|
da7040d783
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-11 22:49:57 -07:00 |
|
Brian Behlendorf
|
c7e8aae563
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-03-11 22:49:54 -07:00 |
|
Brian Behlendorf
|
003387fc38
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-03-11 22:49:49 -07:00 |
|
Brian Behlendorf
|
80590cb371
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-03-11 22:49:47 -07:00 |
|
Brian Behlendorf
|
6023805ba5
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-03-11 22:49:42 -07:00 |
|
Brian Behlendorf
|
909674095a
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-03-11 22:49:40 -07:00 |
|
Brian Behlendorf
|
7f0e57ceca
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-03-11 22:49:35 -07:00 |
|
Brian Behlendorf
|
68818f8c51
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-03-11 22:49:33 -07:00 |
|
Brian Behlendorf
|
73d1d4e7be
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-11 22:49:27 -07:00 |
|
Brian Behlendorf
|
7ffff81846
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-03-11 22:49:26 -07:00 |
|
Brian Behlendorf
|
07b849403d
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-03-11 22:49:19 -07:00 |
|
Brian Behlendorf
|
08a409f648
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-03-11 22:49:17 -07:00 |
|
Brian Behlendorf
|
c3815cea1c
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-03-11 22:49:12 -07:00 |
|
Brian Behlendorf
|
ec7bd3f401
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-11 22:49:10 -07:00 |
|
Brian Behlendorf
|
882ac1e50f
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-11 22:49:09 -07:00 |
|
Brian Behlendorf
|
77c2fa54c0
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-03-11 22:48:58 -07:00 |
|
Brian Behlendorf
|
f9494814c2
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-03-11 22:48:56 -07:00 |
|
Brian Behlendorf
|
dadb99c29a
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-11 22:48:55 -07:00 |
|
Brian Behlendorf
|
b32076fefc
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-03-11 22:48:45 -07:00 |
|
Brian Behlendorf
|
32170ae0f6
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-03-11 22:48:44 -07:00 |
|
Brian Behlendorf
|
9d407e8fb9
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-03-11 22:48:38 -07:00 |
|
Brian Behlendorf
|
5d186bf287
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-03-11 22:48:36 -07:00 |
|
Brian Behlendorf
|
20079ba413
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-03-11 22:48:31 -07:00 |
|
Brian Behlendorf
|
11838bd32c
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-03-11 22:48:29 -07:00 |
|
Brian Behlendorf
|
f3008ff148
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-03-11 22:48:20 -07:00 |
|
Brian Behlendorf
|
77fc222d44
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-03-11 22:48:18 -07:00 |
|
Brian Behlendorf
|
648cfeb794
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-03-11 22:48:13 -07:00 |
|
Brian Behlendorf
|
c47399ecf6
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-03-11 22:48:11 -07:00 |
|
Brian Behlendorf
|
c89f4ca5a1
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-03-11 22:48:05 -07:00 |
|
Brian Behlendorf
|
0c1122b4c3
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-03-11 22:48:04 -07:00 |
|
Brian Behlendorf
|
901d2a8d13
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-03-11 22:47:58 -07:00 |
|
Brian Behlendorf
|
1b9605212b
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-03-11 22:47:56 -07:00 |
|
Brian Behlendorf
|
909582a95e
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-03-11 22:47:56 -07:00 |
|
Brian Behlendorf
|
4b7251e33e
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-03-11 22:47:54 -07:00 |
|
Brian Behlendorf
|
6211d1a370
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-03-11 22:47:54 -07:00 |
|
Brian Behlendorf
|
a2dc88da2a
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-03-11 22:47:53 -07:00 |
|
Brian Behlendorf
|
1c0279a08f
|
Resolve newly revealed unused vars and symbols caused by topic branch.
|
2009-03-11 22:43:09 -07:00 |