30668cb769
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-03-09 12:30:26 -08:00
573328741b
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2010-03-09 12:30:21 -08:00
324bb92af5
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-03-09 12:30:19 -08:00
8f63d438cd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-03-09 12:30:18 -08:00
48e74ed68b
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-03-09 12:30:03 -08:00
9a3d5378c6
Clean up emulation of kernel threads in userspace.
...
Updated to use pthread thread specific data rather than keeping
a global list. This also fixes at least one easily reproducible
crash in ztest
2010-03-09 12:25:28 -08:00
75472ba725
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-03-09 10:32:05 -08:00
1de8dece9c
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-03-09 10:32:03 -08:00
b56a453c68
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-03-09 10:32:02 -08:00
63220bc50d
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-03-09 10:32:00 -08:00
7a5893a148
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-03-09 10:31:55 -08:00
31ad373507
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-03-09 10:31:54 -08:00
ad2f21ae79
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-03-09 10:31:49 -08:00
792a63a7a6
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-03-09 10:31:47 -08:00
ddf5c4723a
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-03-09 10:31:42 -08:00
842b08cc3f
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-03-09 10:31:41 -08:00
daa4742df9
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-03-09 10:31:35 -08:00
49f514aabb
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-09 10:31:33 -08:00
796afe2a80
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-03-09 10:31:28 -08:00
41516067cf
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-03-09 10:31:26 -08:00
7b95f791f7
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-03-09 10:31:21 -08:00
96904978f8
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-03-09 10:31:19 -08:00
fc9e816d54
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-03-09 10:31:14 -08:00
f3df9d18d8
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-03-09 10:31:12 -08:00
244f858c77
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-03-09 10:31:07 -08:00
4d0e16b4a8
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-03-09 10:31:05 -08:00
4af24d3f18
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-03-09 10:31:00 -08:00
4aec8c8fe5
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-09 10:30:58 -08:00
41f03035c7
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-03-09 10:30:53 -08:00
0d3d0d9497
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-09 10:30:51 -08:00
bbb9ce3401
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-09 10:30:50 -08:00
cb3d819487
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-03-09 10:30:41 -08:00
ca6801fcb2
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-03-09 10:30:39 -08:00
a772a6d606
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-03-09 10:30:34 -08:00
85b17181ef
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-03-09 10:30:32 -08:00
a43d8dfd67
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2010-03-09 10:30:28 -08:00
f3aec3d1eb
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-03-09 10:30:26 -08:00
e760d8d950
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-03-09 10:30:21 -08:00
8496a31266
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2010-03-09 10:30:19 -08:00
3a9850385c
Include all headers regardless of depth
...
The previous hack for this was to move headers 3 levels deep in to
the top level include dir and headers 4 levels deep in to sys.
Obviously this was fairly limiting and missed two important headers.
./zfs/include/sys/fm/fs/zfs.h
./zfs/include/sys/fs/zfs.h
This patch updates the code to be smarter and installs all the headers
to the correct location regardless of depth. Each header will have its
leading 3 path args stripped (i.e. ./zfs/include/) and replaced with
the correct install destination. All path information past the first
three levels will be preserved.
2010-03-09 10:20:34 -08:00
84930e629e
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-03-08 16:24:56 -08:00
42088d763e
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-03-08 16:24:55 -08:00
0e5d20ceac
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-03-08 16:24:54 -08:00
a8f1bad9d5
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-03-08 16:24:52 -08:00
398b44a761
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-03-08 16:24:47 -08:00
85d1b54c86
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-03-08 16:24:45 -08:00
16c9959be3
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-03-08 16:24:41 -08:00
97149b90d3
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-03-08 16:24:39 -08:00
b5370773ce
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-03-08 16:24:34 -08:00
490ec1b3e9
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-03-08 16:24:33 -08:00
Brian Behlendorf