43af29de5f
Type int accidentally not declared at the top of the function.
2009-07-09 10:19:02 -07:00
4d410127b0
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-09 08:49:29 -07:00
cc6e67fa7f
Wrap sysevent includes until sysevent or something like it is implemented.
2009-07-09 08:40:33 -07:00
7669102a92
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-08 16:26:27 -07:00
a3d336e1ae
Drop support for the Solaris user space thread_t API. This was just
...
too confusing. The two consumers of this (ztest.c and taskq.c) have
been updated to use the Solaris kernel space kthread_t API which is
provided by zfs_context.h.
2009-07-08 16:15:42 -07:00
33a6be1421
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-07-08 16:13:13 -07:00
3d768f2537
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-07-08 16:13:10 -07:00
3a0aa64be1
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-07-08 16:13:00 -07:00
88acc774ac
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-07-08 16:12:52 -07:00
28aa8dbeff
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-07-08 16:12:42 -07:00
29bc1b0729
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-08 16:12:39 -07:00
1711850ad3
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-07-08 16:12:28 -07:00
9989280a8d
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-07-08 16:12:25 -07:00
b1e0515732
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-08 16:12:16 -07:00
886c09dd08
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-07-08 16:12:13 -07:00
a45e7ad2d4
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-07-08 16:12:01 -07:00
f0fb421934
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-08 16:11:58 -07:00
9d92074b1a
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-07-08 16:11:48 -07:00
92d51724d5
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-08 16:11:44 -07:00
c21966694c
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-07-08 16:11:34 -07:00
966764980e
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-08 16:11:31 -07:00
31b819f0ed
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-07-08 16:11:21 -07:00
d0e1f95d2b
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-07-08 16:11:18 -07:00
9912c7e88a
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-07-08 16:11:08 -07:00
218bae9df9
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-08 16:11:04 -07:00
6438eb6266
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-07-08 16:10:54 -07:00
6dc5bb52dd
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-08 16:10:51 -07:00
34d6b92c20
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-07-08 16:10:41 -07:00
7ae72fda28
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-08 16:10:37 -07:00
83e9571a9a
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-07-08 16:10:26 -07:00
34cf67f0ed
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-08 16:10:23 -07:00
158167cc72
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-08 16:10:22 -07:00
95c6aef584
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-08 16:10:04 -07:00
66b89947fa
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-08 16:10:01 -07:00
664f17e68b
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-08 16:09:59 -07:00
82284a9f24
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-07-08 16:09:38 -07:00
d63eba2900
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-07-08 16:09:35 -07:00
e154590d5c
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-07-08 16:09:25 -07:00
1a3542b96a
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-07-08 16:09:20 -07:00
d7953df875
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-07-08 16:09:10 -07:00
b2d5b42a02
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-08 16:09:07 -07:00
1e3905f18b
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-07-08 16:08:57 -07:00
4f8cdd006b
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-07-08 16:08:53 -07:00
08dcdecc9f
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-07-08 16:08:44 -07:00
5a4d642a1e
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-08 16:08:40 -07:00
99c5ba7675
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-07-08 16:08:30 -07:00
b43a728b12
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-07-08 16:08:27 -07:00
963603808d
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-08 16:08:18 -07:00
b8a94a9e3b
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-08 16:08:14 -07:00
8070ba7bea
Untracked pthread changes which must have accidentally crept in.
...
This is exactly the reason why I want a new topgit command which
takes the base, then incrementally applies all the patches and
compares them againsts what is actually committed. This would
ensure this sort of thing doesn't happen!
2009-07-08 15:58:28 -07:00
Brian Behlendorf