Brian Behlendorf
|
580f419bbd
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-07-01 12:55:46 -07:00 |
|
Brian Behlendorf
|
b0c55bfd41
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-07-01 12:55:44 -07:00 |
|
Brian Behlendorf
|
5cb11f4ffd
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-07-01 12:55:39 -07:00 |
|
Brian Behlendorf
|
816b16dd08
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-07-01 12:55:37 -07:00 |
|
Brian Behlendorf
|
a749706736
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-07-01 12:55:32 -07:00 |
|
Brian Behlendorf
|
76ffd33eae
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-07-01 12:55:30 -07:00 |
|
Brian Behlendorf
|
01ff9d82d5
|
Install zfs_config, zfs_unconfig, symbols in to correct location.
Provide a zfs.release file as part of the package.
|
2009-07-01 12:51:06 -07:00 |
|
Brian Behlendorf
|
255ef81e33
|
Fix 'make dist' on powerpc64 by include an atomic.S place holder file.
Add EXTRA_DIST atomic.c for powerpc64 to ensure source is packaged.
|
2009-07-01 12:49:10 -07:00 |
|
Brian Behlendorf
|
5974d1d85e
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-07-01 11:36:21 -07:00 |
|
Brian Behlendorf
|
63845164a6
|
Use $(RM) macro to ensure -f is passed.
Preserve path for installed headers with nobase.
|
2009-07-01 11:31:47 -07:00 |
|
Brian Behlendorf
|
2f5dd8c3c3
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-07-01 11:11:57 -07:00 |
|
Brian Behlendorf
|
ab4146db46
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-07-01 11:11:55 -07:00 |
|
Brian Behlendorf
|
b321946648
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-07-01 11:11:50 -07:00 |
|
Brian Behlendorf
|
df388bfc0a
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-07-01 11:11:48 -07:00 |
|
Brian Behlendorf
|
e956869d17
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-07-01 11:11:43 -07:00 |
|
Brian Behlendorf
|
a5e9c5bc65
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-07-01 11:11:41 -07:00 |
|
Brian Behlendorf
|
1d0a30f5a5
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-07-01 11:11:36 -07:00 |
|
Brian Behlendorf
|
685b7d85d3
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-07-01 11:11:34 -07:00 |
|
Brian Behlendorf
|
bd840df630
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-07-01 11:11:29 -07:00 |
|
Brian Behlendorf
|
94390a0793
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-07-01 11:11:27 -07:00 |
|
Brian Behlendorf
|
cdec7ff523
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-01 11:11:22 -07:00 |
|
Brian Behlendorf
|
d959a6177a
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-07-01 11:11:20 -07:00 |
|
Brian Behlendorf
|
c198cbe54f
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-07-01 11:11:14 -07:00 |
|
Brian Behlendorf
|
9fd939766f
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-07-01 11:11:12 -07:00 |
|
Brian Behlendorf
|
06652dd306
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-07-01 11:11:07 -07:00 |
|
Brian Behlendorf
|
518b58f35b
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-07-01 11:11:05 -07:00 |
|
Brian Behlendorf
|
4339e96c34
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-07-01 11:11:00 -07:00 |
|
Brian Behlendorf
|
10c43094ed
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-07-01 11:10:58 -07:00 |
|
Brian Behlendorf
|
29b022a4b1
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-01 11:10:53 -07:00 |
|
Brian Behlendorf
|
3c96976b99
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-07-01 11:10:51 -07:00 |
|
Brian Behlendorf
|
4cac8c23ea
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-07-01 11:10:46 -07:00 |
|
Brian Behlendorf
|
212ecc6560
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-07-01 11:10:44 -07:00 |
|
Brian Behlendorf
|
1c2ca36488
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-07-01 11:10:39 -07:00 |
|
Brian Behlendorf
|
bfa8b02c2c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-07-01 11:10:37 -07:00 |
|
Brian Behlendorf
|
d4721058bc
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-07-01 11:10:36 -07:00 |
|
Brian Behlendorf
|
f6f03b8fcb
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-07-01 11:10:27 -07:00 |
|
Brian Behlendorf
|
a37fb966bd
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-07-01 11:10:25 -07:00 |
|
Brian Behlendorf
|
8c684c8d85
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-07-01 11:10:24 -07:00 |
|
Brian Behlendorf
|
095f7bd7d5
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-07-01 11:10:15 -07:00 |
|
Brian Behlendorf
|
578f6e03f2
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-07-01 11:10:13 -07:00 |
|
Brian Behlendorf
|
5501d95f8e
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-07-01 11:10:08 -07:00 |
|
Brian Behlendorf
|
f8ff6aa720
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-07-01 11:10:06 -07:00 |
|
Brian Behlendorf
|
113f86f222
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-07-01 11:10:01 -07:00 |
|
Brian Behlendorf
|
95ab1a0980
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-07-01 11:09:59 -07:00 |
|
Brian Behlendorf
|
59048423bf
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-07-01 11:09:54 -07:00 |
|
Brian Behlendorf
|
78f7e07b9a
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-07-01 11:09:52 -07:00 |
|
Brian Behlendorf
|
e1349aad89
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-07-01 11:09:47 -07:00 |
|
Brian Behlendorf
|
7262d13e72
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-07-01 11:09:45 -07:00 |
|
Brian Behlendorf
|
9f7cf23531
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-07-01 11:09:40 -07:00 |
|
Brian Behlendorf
|
a60390f3b0
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-07-01 11:09:38 -07:00 |