Brian Behlendorf
8c39234572
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-05-18 12:32:31 -07:00
Brian Behlendorf
f05cdf34db
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-05-18 12:32:29 -07:00
Brian Behlendorf
34f24ab8a4
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-18 12:32:21 -07:00
Brian Behlendorf
a1dcfdc8ec
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-18 12:32:20 -07:00
Brian Behlendorf
f2017cf5ca
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-18 12:32:12 -07:00
Brian Behlendorf
31ce6ad143
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-18 12:32:10 -07:00
Brian Behlendorf
38f508cf55
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-18 12:32:03 -07:00
Brian Behlendorf
adaa0faac2
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-18 12:32:01 -07:00
Brian Behlendorf
a51f101a05
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-18 12:31:53 -07:00
Brian Behlendorf
54a2f6988b
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-18 12:31:51 -07:00
Brian Behlendorf
a42de27ec8
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-18 12:31:44 -07:00
Brian Behlendorf
b7bf1b3685
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-18 12:31:42 -07:00
Brian Behlendorf
54e1ec4964
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-18 12:31:35 -07:00
Brian Behlendorf
9d1f0810f4
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-18 12:31:33 -07:00
Brian Behlendorf
8c13a94e42
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-18 12:31:25 -07:00
Brian Behlendorf
54b0d2ca6d
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-18 12:31:23 -07:00
Brian Behlendorf
2e29313cfa
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-18 12:31:16 -07:00
Brian Behlendorf
84e8568b3a
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-18 12:31:14 -07:00
Brian Behlendorf
13ad721a84
Move user-arch.m4 change from linux-libspl to zfs-branch.
2010-05-18 12:26:48 -07:00
Brian Behlendorf
f5d944f935
Move user-arch.m4 change from linux-libspl to zfs-branch.
2010-05-18 12:25:15 -07:00
Brian Behlendorf
e5ba141d5b
Remove linux-legacy dependency.
2010-05-18 12:17:55 -07:00
Brian Behlendorf
73e29123bc
Merge commit 'refs/top-bases/top' into top
2010-05-18 12:17:21 -07:00
Brian Behlendorf
caef19af88
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-18 12:17:20 -07:00
Brian Behlendorf
48e40c7007
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-18 12:17:19 -07:00
Brian Behlendorf
9c65da32f1
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-05-18 12:17:18 -07:00
Brian Behlendorf
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
Brian Behlendorf
f613685a0b
Merge commit 'refs/top-bases/top' into top
2010-05-18 11:49:52 -07:00
Brian Behlendorf
bad911d0fe
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-18 11:49:51 -07:00
Brian Behlendorf
98fc119dc8
Drop empty linux-docs branch to simplify topgit ADG.
2010-05-18 11:45:16 -07:00
Brian Behlendorf
8c361d5b56
Merge commit 'refs/top-bases/top' into top
2010-05-18 11:40:32 -07:00
Brian Behlendorf
fa1508776d
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-18 11:40:31 -07:00
Brian Behlendorf
91975bc4f9
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-18 11:40:29 -07:00
Brian Behlendorf
42cd191c9f
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-18 11:40:29 -07:00
Brian Behlendorf
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
Brian Behlendorf
74808f351b
Merge commit 'refs/top-bases/top' into top
2010-05-18 11:16:42 -07:00
Brian Behlendorf
f22023ef59
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-18 11:16:41 -07:00
Brian Behlendorf
3f029a1a20
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-18 11:16:39 -07:00
Brian Behlendorf
3da3ca2558
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-18 11:16:38 -07:00
Brian Behlendorf
4e83d750ff
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-18 11:16:37 -07:00
Brian Behlendorf
76b391291f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-18 11:16:36 -07:00
Brian Behlendorf
e13b9a5c03
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-18 11:16:22 -07:00
Brian Behlendorf
bc61336679
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-05-18 11:16:20 -07:00
Brian Behlendorf
d143871ffa
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-05-18 11:16:12 -07:00
Brian Behlendorf
857cd8f8c9
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-05-18 11:16:10 -07:00
Brian Behlendorf
0322ae1430
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-05-18 11:16:03 -07:00
Brian Behlendorf
cb0c398974
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-05-18 11:16:01 -07:00
Brian Behlendorf
9f000c4f0d
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-05-18 11:15:53 -07:00
Brian Behlendorf
6938cdb721
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-18 11:15:51 -07:00
Brian Behlendorf
97abc84dd4
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-05-18 11:15:44 -07:00
Brian Behlendorf
4721f936e1
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-05-18 11:15:42 -07:00
