Brian Behlendorf
|
935ccde17f
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:17:12 -08:00 |
|
Brian Behlendorf
|
012bd58bcd
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-06 13:17:11 -08:00 |
|
Brian Behlendorf
|
033b84230f
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:17:08 -08:00 |
|
Brian Behlendorf
|
791ca841bd
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-06 13:17:06 -08:00 |
|
Brian Behlendorf
|
b5406ef468
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:17:03 -08:00 |
|
Brian Behlendorf
|
bf0e564947
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-06 13:17:02 -08:00 |
|
Brian Behlendorf
|
7025164bac
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:16:59 -08:00 |
|
Brian Behlendorf
|
446470c90a
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-06 13:16:58 -08:00 |
|
Brian Behlendorf
|
7639f4e4a8
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:16:55 -08:00 |
|
Brian Behlendorf
|
da6d7ab293
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-06 13:16:53 -08:00 |
|
Brian Behlendorf
|
4e5864ca89
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:16:51 -08:00 |
|
Brian Behlendorf
|
09a5a916ec
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-06 13:16:49 -08:00 |
|
Brian Behlendorf
|
0e16147946
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-06 13:16:49 -08:00 |
|
Brian Behlendorf
|
cf665846e9
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:16:44 -08:00 |
|
Brian Behlendorf
|
5f6f39da9a
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-06 13:16:43 -08:00 |
|
Brian Behlendorf
|
74bff69746
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-06 13:16:42 -08:00 |
|
Brian Behlendorf
|
c52db003cd
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:16:37 -08:00 |
|
Brian Behlendorf
|
b66ccfae04
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-06 13:16:36 -08:00 |
|
Brian Behlendorf
|
826a863018
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:16:33 -08:00 |
|
Brian Behlendorf
|
6015482f84
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-06 13:16:31 -08:00 |
|
Brian Behlendorf
|
6c89593bab
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:16:28 -08:00 |
|
Brian Behlendorf
|
14cb6f1548
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-06 13:16:27 -08:00 |
|
Brian Behlendorf
|
ebb33e06c5
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:16:24 -08:00 |
|
Brian Behlendorf
|
3cb3b446f7
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-06 13:16:23 -08:00 |
|
Brian Behlendorf
|
2020110f6e
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:16:20 -08:00 |
|
Brian Behlendorf
|
63e4be5912
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-06 13:16:18 -08:00 |
|
Brian Behlendorf
|
cdebfb1941
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:16:16 -08:00 |
|
Brian Behlendorf
|
23bbbe7e2e
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-06 13:16:14 -08:00 |
|
Brian Behlendorf
|
27614e4fe5
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:16:11 -08:00 |
|
Brian Behlendorf
|
ead5766a7a
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-06 13:16:10 -08:00 |
|
Brian Behlendorf
|
f9494f2bb1
|
Build missing sources
|
2009-01-06 13:14:30 -08:00 |
|
Brian Behlendorf
|
289dd108f1
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:01:43 -08:00 |
|
Brian Behlendorf
|
d9da5a5c32
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-06 13:01:42 -08:00 |
|
Brian Behlendorf
|
199bfd663a
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:01:39 -08:00 |
|
Brian Behlendorf
|
b9b559258c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-06 13:01:38 -08:00 |
|
Brian Behlendorf
|
6842512863
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-06 13:01:37 -08:00 |
|
Brian Behlendorf
|
7acfdabf20
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:01:32 -08:00 |
|
Brian Behlendorf
|
63c9f3ff72
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-06 13:01:30 -08:00 |
|
Brian Behlendorf
|
57aad95a52
|
Refresh exported symbols
|
2009-01-06 12:59:50 -08:00 |
|
Brian Behlendorf
|
cca384cc3d
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-06 12:36:29 -08:00 |
|
Brian Behlendorf
|
65923b99f9
|
Update to use DS_MODE_USER not removed DS_MODE_STANDARD
|
2009-01-06 12:32:44 -08:00 |
|
Brian Behlendorf
|
31781c93df
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-06 11:38:37 -08:00 |
|
Brian Behlendorf
|
a6dba6330c
|
Add missing include paths
|
2009-01-06 11:36:56 -08:00 |
|
Brian Behlendorf
|
d000467b7f
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-06 11:04:16 -08:00 |
|
Brian Behlendorf
|
fa03d4582f
|
Remove circular dependency
|
2009-01-06 11:02:36 -08:00 |
|
Brian Behlendorf
|
608b2dd1c0
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:57:22 -08:00 |
|
Brian Behlendorf
|
d785c6d77a
|
Should use zpios not kpios
|
2009-01-06 09:55:40 -08:00 |
|
Brian Behlendorf
|
b9e46825f5
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:50:16 -08:00 |
|
Brian Behlendorf
|
11b7f20ce1
|
Ensure zpios module makefile is built
|
2009-01-06 09:48:33 -08:00 |
|
Brian Behlendorf
|
def6835af7
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:40:37 -08:00 |