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
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
91975bc4f9
Merge branch 'linux-kernel-disk' into refs/top-bases/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
3da3ca2558
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-18 11:16:38 -07:00
4e83d750ff
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-18 11:16:37 -07:00
76b391291f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-18 11:16:36 -07:00
e13b9a5c03
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-18 11:16:22 -07:00
bc61336679
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-05-18 11:16:20 -07:00
d143871ffa
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-05-18 11:16:12 -07:00
857cd8f8c9
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-05-18 11:16:10 -07:00
0322ae1430
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-05-18 11:16:03 -07:00
cb0c398974
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-05-18 11:16:01 -07:00
9f000c4f0d
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-05-18 11:15:53 -07:00
6938cdb721
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-18 11:15:51 -07:00
97abc84dd4
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-05-18 11:15:44 -07:00
4721f936e1
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-05-18 11:15:42 -07:00
db338f59a5
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-18 11:15:35 -07:00
794f62f6f7
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-18 11:15:33 -07:00
072aa8070d
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-18 11:15:25 -07:00
c4e86de5a3
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-18 11:15:24 -07:00
9809ad7872
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-18 11:15:16 -07:00
5731737da3
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-18 11:15:14 -07:00
fe93d4e90e
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-18 11:15:06 -07:00
4e672cb129
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-18 11:15:04 -07:00
6c2f1acad2
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-05-18 11:14:56 -07:00
50f5b891f1
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-05-18 11:14:54 -07:00
c4aa9335db
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-18 11:14:47 -07:00
e961e61396
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-18 11:14:45 -07:00
9f1ca95cbc
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-18 11:14:38 -07:00
2578e519ab
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-18 11:14:36 -07:00
1d545e51a7
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-18 11:14:28 -07:00
5b9fcd549f
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-18 11:14:25 -07:00
d9f8f1ab85
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-18 11:14:18 -07:00
a988acd565
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-18 11:14:16 -07:00
18eac7eccf
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-05-18 11:14:08 -07:00
d115e15d29
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-18 11:14:06 -07:00
11496f63c4
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2010-05-18 11:14:06 -07:00
c88a793e82
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-05-18 11:14:05 -07:00
Brian Behlendorf