fa94cf43b9
Update COPYRIGHT to reference zpios CDDL exceptions.
2010-05-18 14:25:28 -07:00
ed88394ab2
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-18 14:23:09 -07:00
630ce17804
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-18 14:23:08 -07:00
86f961b310
Update all zpios related headers for consistency and correctness.
2010-05-18 14:18:09 -07:00
bd9e588b29
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-18 13:42:35 -07:00
ae9ef8987f
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-18 13:42:34 -07:00
c98946e318
Add missing CDDL headers.
2010-05-18 13:38:06 -07:00
8149cee19b
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-18 12:53:05 -07:00
c5004e8fb1
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-18 12:53:04 -07:00
2a80af91ed
Remove nvpair_alloc_system.c change in libspl topic branch.
...
A change to the nvpair implementation should not have been made in
the libspl-topic branch. This patch fixes that accident by reverting
the change and providing the missing libspl header to allow the
proper building of nvpair_alloc_system.c without the need to modify it.
2010-05-18 12:47:08 -07:00
d2f59cd264
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-18 12:33:26 -07:00
36cc7b6257
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-18 12:33:25 -07:00
df0b1319af
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-18 12:33:23 -07:00
2fd07e9b86
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-18 12:33:23 -07:00
b6a33b0865
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-18 12:33:08 -07:00
55852e36b0
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-05-18 12:33:06 -07:00
c1feaa2ef4
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-05-18 12:32:59 -07:00
1004947023
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-05-18 12:32:57 -07:00
cd3ffcafd4
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-05-18 12:32:49 -07:00
619efe1f74
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-05-18 12:32:47 -07:00
067a16c51e
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-05-18 12:32:40 -07:00
a342d7759f
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-18 12:32:38 -07:00
8c39234572
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-05-18 12:32:31 -07:00
f05cdf34db
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-05-18 12:32:29 -07:00
34f24ab8a4
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-18 12:32:21 -07:00
a1dcfdc8ec
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-18 12:32:20 -07:00
f2017cf5ca
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-18 12:32:12 -07:00
31ce6ad143
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-18 12:32:10 -07:00
38f508cf55
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-18 12:32:03 -07:00
adaa0faac2
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-18 12:32:01 -07:00
a51f101a05
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-18 12:31:53 -07:00
54a2f6988b
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-18 12:31:51 -07:00
a42de27ec8
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-18 12:31:44 -07:00
b7bf1b3685
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-18 12:31:42 -07:00
54e1ec4964
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-18 12:31:35 -07:00
9d1f0810f4
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-18 12:31:33 -07:00
8c13a94e42
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-18 12:31:25 -07:00
54b0d2ca6d
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-18 12:31:23 -07:00
2e29313cfa
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-18 12:31:16 -07:00
84e8568b3a
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-18 12:31:14 -07:00
13ad721a84
Move user-arch.m4 change from linux-libspl to zfs-branch.
2010-05-18 12:26:48 -07:00
e5ba141d5b
Remove linux-legacy dependency.
2010-05-18 12:17:55 -07:00
48e40c7007
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-18 12:17:19 -07:00
9c65da32f1
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-05-18 12:17:18 -07:00
a056f3de6d
Revert linux-legacy topic branch.
...
These changes were made when some development was still occuring
under RHEL4. Since then the needed fopendir() and atopen() APIs
have become commonly available under Linux. Since I have no
intention of supporting systems as old as RHEL4 we can safely
drop the topic branch.
2010-05-18 12:10:13 -07:00
98fc119dc8
Drop empty linux-docs branch to simplify topgit ADG.
2010-05-18 11:45:16 -07:00
91975bc4f9
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-18 11:40:29 -07:00
42cd191c9f
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-18 11:40:29 -07:00
a2c57ce830
Update headers to be correct for public release
...
This includes adding the copyright where appropriate, author
attribution, and including the Lawrence Livermore National
Security, LLC release code for new/rewritten files.
2010-05-18 11:31:37 -07:00
3f029a1a20
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-18 11:16:39 -07:00
Brian Behlendorf