Brian Behlendorf
|
ee2e34a7a5
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 12:10:50 -08:00 |
|
Brian Behlendorf
|
eb4c53562b
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 12:10:06 -08:00 |
|
Brian Behlendorf
|
fef6be057e
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 12:09:57 -08:00 |
|
Brian Behlendorf
|
bb5b627011
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 12:09:48 -08:00 |
|
Brian Behlendorf
|
8e9ab16b20
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 12:09:23 -08:00 |
|
Brian Behlendorf
|
78f7affc44
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-19 12:08:57 -08:00 |
|
Brian Behlendorf
|
3ce12f6815
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 12:08:24 -08:00 |
|
Brian Behlendorf
|
e485017676
|
Remove spa_boot from userspace build
|
2008-12-19 12:04:45 -08:00 |
|
Brian Behlendorf
|
f72a142146
|
Strip out sunddi support, this can be done in context
|
2008-12-19 12:04:07 -08:00 |
|
Brian Behlendorf
|
7113cd69f5
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-19 11:57:27 -08:00 |
|
Brian Behlendorf
|
5f0e8b8d91
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:57:25 -08:00 |
|
Brian Behlendorf
|
273cbc844a
|
Fix trailing 'a' char
|
2008-12-19 11:55:38 -08:00 |
|
Brian Behlendorf
|
a6bda2c1b5
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-19 11:50:11 -08:00 |
|
Brian Behlendorf
|
02bef1e61b
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:50:09 -08:00 |
|
Brian Behlendorf
|
f9a746f44f
|
Flesh out some more of the sunddi
|
2008-12-19 11:48:21 -08:00 |
|
Brian Behlendorf
|
70d3d22ccb
|
Refresh autogen products
|
2008-12-19 11:36:16 -08:00 |
|
Brian Behlendorf
|
5eb924f9e8
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-19 11:32:35 -08:00 |
|
Brian Behlendorf
|
b8e10bfc20
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:32:33 -08:00 |
|
Brian Behlendorf
|
615168d176
|
Stub out additional sunddi interfaces
|
2008-12-19 11:30:42 -08:00 |
|
Brian Behlendorf
|
904c8b37c4
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-19 11:14:56 -08:00 |
|
Brian Behlendorf
|
1fb4f38e73
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:14:55 -08:00 |
|
Brian Behlendorf
|
ce80c4a422
|
Add utsname.h header
|
2008-12-19 11:13:07 -08:00 |
|
Brian Behlendorf
|
63a40005a1
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-19 10:20:03 -08:00 |
|
Brian Behlendorf
|
08ecd85f89
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-19 10:19:53 -08:00 |
|
Brian Behlendorf
|
726f45d53d
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 10:19:42 -08:00 |
|
Brian Behlendorf
|
7ef56c4e1c
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 10:19:17 -08:00 |
|
Brian Behlendorf
|
1a238799ba
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 10:19:12 -08:00 |
|
Brian Behlendorf
|
42e7e0b017
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 10:19:07 -08:00 |
|
Brian Behlendorf
|
a577858f33
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 10:18:53 -08:00 |
|
Brian Behlendorf
|
41016312ae
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-19 10:18:36 -08:00 |
|
Brian Behlendorf
|
143bd1614e
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:18:16 -08:00 |
|
Brian Behlendorf
|
9de4108779
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 10:18:12 -08:00 |
|
Brian Behlendorf
|
3e2e5c4535
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-19 10:18:12 -08:00 |
|
Brian Behlendorf
|
a68af79057
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-19 10:18:11 -08:00 |
|
Brian Behlendorf
|
d4c39af7a6
|
Re-add KM_PUSHPAGE
|
2008-12-19 10:15:52 -08:00 |
|
Brian Behlendorf
|
330840ff2e
|
Re-add KM_PUSHPAGE
|
2008-12-19 10:15:27 -08:00 |
|
Brian Behlendorf
|
30861da8a8
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-19 10:11:33 -08:00 |
|
Brian Behlendorf
|
b6d881a293
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:11:30 -08:00 |
|
Brian Behlendorf
|
75b98b396b
|
Add missing VM types
|
2008-12-19 10:09:35 -08:00 |
|
Brian Behlendorf
|
a9e7b6fc2f
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-19 10:03:34 -08:00 |
|
Brian Behlendorf
|
67b265106b
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:03:31 -08:00 |
|
Brian Behlendorf
|
8578673221
|
Add DTRACE_PROBE(a) macro
|
2008-12-19 10:01:38 -08:00 |
|
Brian Behlendorf
|
62f6c8fe77
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-19 09:54:53 -08:00 |
|
Brian Behlendorf
|
fa6f423f31
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-19 09:54:43 -08:00 |
|
Brian Behlendorf
|
cd0966054f
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 09:54:32 -08:00 |
|
Brian Behlendorf
|
e17e93da32
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 09:54:04 -08:00 |
|
Brian Behlendorf
|
ec916d278e
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 09:53:57 -08:00 |
|
Brian Behlendorf
|
9a20c1615b
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 09:53:52 -08:00 |
|
Brian Behlendorf
|
1a0d43ceac
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 09:53:37 -08:00 |
|
Brian Behlendorf
|
10fd4b002f
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-19 09:53:17 -08:00 |
|
Brian Behlendorf
|
24e15d1bb1
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 09:52:57 -08:00 |
|
Brian Behlendorf
|
2d0ae2710c
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 09:52:53 -08:00 |
|
Brian Behlendorf
|
5906903384
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-19 09:52:52 -08:00 |
|
Brian Behlendorf
|
3d8832a795
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-19 09:52:51 -08:00 |
|
Brian Behlendorf
|
3bc48c3e74
|
Missing func readd
|
2008-12-19 09:50:15 -08:00 |
|
Brian Behlendorf
|
111303eeb8
|
context
|
2008-12-19 09:47:09 -08:00 |
|
Brian Behlendorf
|
dbc567603d
|
Readd removed hunk
|
2008-12-19 09:39:17 -08:00 |
|
Brian Behlendorf
|
2c874ef298
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-19 09:32:53 -08:00 |
|
Brian Behlendorf
|
56217b4c11
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 09:32:50 -08:00 |
|
Brian Behlendorf
|
cdcb2af79b
|
Add proper header
|
2008-12-19 09:30:56 -08:00 |
|
Brian Behlendorf
|
7cf32c82f6
|
Refresh autogen products
|
2008-12-19 09:25:52 -08:00 |
|
Brian Behlendorf
|
9ea2ed5b47
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-19 09:08:07 -08:00 |
|
Brian Behlendorf
|
1e0f1b2c02
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 09:08:03 -08:00 |
|
Brian Behlendorf
|
a1e023d7a4
|
Add strtoxx functions
|
2008-12-19 09:05:50 -08:00 |
|
Brian Behlendorf
|
3da25300e3
|
Refresh autogen products
|
2008-12-18 14:02:22 -08:00 |
|
Brian Behlendorf
|
896e89ac4a
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-18 13:20:15 -08:00 |
|
Brian Behlendorf
|
acfcb00a6e
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-18 13:20:04 -08:00 |
|
Brian Behlendorf
|
97a0b13aec
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-18 13:19:54 -08:00 |
|
Brian Behlendorf
|
7299994fcf
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-18 13:19:28 -08:00 |
|
Brian Behlendorf
|
1eaa464a82
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-18 13:19:22 -08:00 |
|
Brian Behlendorf
|
155929dfcd
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-18 13:19:17 -08:00 |
|
Brian Behlendorf
|
e6169bf282
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 13:19:03 -08:00 |
|
Brian Behlendorf
|
e55e3643df
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-18 13:18:46 -08:00 |
|
Brian Behlendorf
|
da1ceb2bbe
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:18:27 -08:00 |
|
Brian Behlendorf
|
72bf32a79f
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 13:18:19 -08:00 |
|
Brian Behlendorf
|
844a9ced6d
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-18 13:18:17 -08:00 |
|
Brian Behlendorf
|
33e499be43
|
Merge branch 'fix-stack' into refs/top-bases/fix-branch
|
2008-12-18 13:18:15 -08:00 |
|
Brian Behlendorf
|
8e136cf0c9
|
Add noinline macro for userspace
|
2008-12-18 13:15:58 -08:00 |
|
Brian Behlendorf
|
0172b08863
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-18 10:03:25 -08:00 |
|
Brian Behlendorf
|
16dc43525b
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-18 10:03:15 -08:00 |
|
Brian Behlendorf
|
dc78b79ec8
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-18 10:03:05 -08:00 |
|
Brian Behlendorf
|
bf922798ae
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-18 10:02:41 -08:00 |
|
Brian Behlendorf
|
2956fc01be
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-18 10:02:36 -08:00 |
|
Brian Behlendorf
|
8fa18afc2e
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-18 10:02:32 -08:00 |
|
Brian Behlendorf
|
c5472b82d0
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 10:02:19 -08:00 |
|
Brian Behlendorf
|
ed5b55e3b2
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-18 10:02:02 -08:00 |
|
Brian Behlendorf
|
4d86e8fa92
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-18 10:01:44 -08:00 |
|
Brian Behlendorf
|
0a353443cd
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 10:01:41 -08:00 |
|
Brian Behlendorf
|
9c0846462b
|
Resolve conflict
|
2008-12-18 10:01:37 -08:00 |
|
Brian Behlendorf
|
4df7b421a1
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-18 10:00:46 -08:00 |
|
Brian Behlendorf
|
25a3fca866
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-18 10:00:45 -08:00 |
|
Brian Behlendorf
|
9e195d0cbf
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-18 10:00:44 -08:00 |
|
Brian Behlendorf
|
c8f253cda8
|
Now fixed in fix-pthreads branch
|
2008-12-18 09:58:42 -08:00 |
|
Brian Behlendorf
|
229aba2943
|
Properly cast thread functions for pthreads
|
2008-12-18 09:56:22 -08:00 |
|
Brian Behlendorf
|
893ed2fad0
|
Properly cast thread functions for pthreads
|
2008-12-18 09:56:05 -08:00 |
|
Brian Behlendorf
|
c037865684
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-18 09:40:10 -08:00 |
|
Brian Behlendorf
|
d511dad31e
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-18 09:40:07 -08:00 |
|
Brian Behlendorf
|
5915f86ab1
|
Add callb.h header
|
2008-12-18 09:38:10 -08:00 |
|
Brian Behlendorf
|
1c78d7d61d
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-18 09:36:25 -08:00 |
|
Brian Behlendorf
|
fe5b927a4a
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-18 09:36:22 -08:00 |
|
Brian Behlendorf
|
0a6ac25d10
|
Add vmem_ interface mapping for user space
|
2008-12-18 09:34:27 -08:00 |
|
Brian Behlendorf
|
e637016382
|
Refresh autogen products
|
2008-12-17 16:48:35 -08:00 |
|
Brian Behlendorf
|
addd4c977d
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 16:47:36 -08:00 |
|
Brian Behlendorf
|
c90836a39f
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-17 16:47:17 -08:00 |
|
Brian Behlendorf
|
86bc861773
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 16:46:59 -08:00 |
|
Brian Behlendorf
|
58e5869872
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 16:46:10 -08:00 |
|
Brian Behlendorf
|
56d78748f6
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 16:45:57 -08:00 |
|
Brian Behlendorf
|
7053ff3e65
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 16:45:45 -08:00 |
|
Brian Behlendorf
|
eb8725f0f8
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 16:45:15 -08:00 |
|
Brian Behlendorf
|
95158f8107
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 16:44:35 -08:00 |
|
Brian Behlendorf
|
c27a2516c2
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:43:55 -08:00 |
|
Brian Behlendorf
|
f799177730
|
Add all sources for libzfs userspace funcationality
|
2008-12-17 16:39:45 -08:00 |
|
Brian Behlendorf
|
546961cdc0
|
Add autogen products
|
2008-12-17 16:24:56 -08:00 |
|
Brian Behlendorf
|
0b022545bf
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 16:08:11 -08:00 |
|
Brian Behlendorf
|
8b33b8f8cd
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:08:05 -08:00 |
|
Brian Behlendorf
|
0f7520c7b0
|
Add gethrtime
|
2008-12-17 16:04:10 -08:00 |
|
Brian Behlendorf
|
210f3e716a
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 16:00:34 -08:00 |
|
Brian Behlendorf
|
b07886e188
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:00:29 -08:00 |
|
Brian Behlendorf
|
9ab4c93028
|
Wrap more stuff in HAVE_ZPL
|
2008-12-17 15:58:20 -08:00 |
|
Brian Behlendorf
|
35fe8215ef
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 15:35:43 -08:00 |
|
Brian Behlendorf
|
9877a35f9f
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 15:35:41 -08:00 |
|
Brian Behlendorf
|
06005641bb
|
Stub out mount/share related func
|
2008-12-17 15:33:45 -08:00 |
|
Brian Behlendorf
|
7278ab4224
|
Refresh autogen products
|
2008-12-17 14:51:43 -08:00 |
|
Brian Behlendorf
|
89494374b0
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 14:36:45 -08:00 |
|
Brian Behlendorf
|
99a4e4a121
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 14:36:43 -08:00 |
|
Brian Behlendorf
|
e3150dafb7
|
Add getexecname to Makefile.am
|
2008-12-17 14:34:48 -08:00 |
|
Brian Behlendorf
|
25fdaadeb0
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 14:16:22 -08:00 |
|
Brian Behlendorf
|
6a0d0cbd0f
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 14:16:20 -08:00 |
|
Brian Behlendorf
|
370f0a1773
|
Add zone and getmntany sources
|
2008-12-17 14:14:23 -08:00 |
|
Brian Behlendorf
|
8e0b1b519e
|
Refresh autogen products
|
2008-12-17 13:39:34 -08:00 |
|
Brian Behlendorf
|
fd77571d28
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 13:38:46 -08:00 |
|
Brian Behlendorf
|
c1e34481d8
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-17 13:38:38 -08:00 |
|
Brian Behlendorf
|
0590c2a818
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 13:38:28 -08:00 |
|
Brian Behlendorf
|
6a6463a6a6
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 13:38:05 -08:00 |
|
Brian Behlendorf
|
4a07f548c1
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 13:38:01 -08:00 |
|
Brian Behlendorf
|
17ce6fed40
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 13:37:56 -08:00 |
|
Brian Behlendorf
|
cacdbdba2f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 13:37:44 -08:00 |
|
Brian Behlendorf
|
7139f15b92
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 13:37:27 -08:00 |
|
Brian Behlendorf
|
3be083292c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:37:10 -08:00 |
|
Brian Behlendorf
|
ba3d5afa54
|
Add missing \
|
2008-12-17 13:35:06 -08:00 |
|
Brian Behlendorf
|
effc496583
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 11:37:56 -08:00 |
|
Brian Behlendorf
|
33b73cd800
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-17 11:37:48 -08:00 |
|
Brian Behlendorf
|
e91e5900c3
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 11:37:38 -08:00 |
|
Brian Behlendorf
|
bda39e3f52
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 11:37:16 -08:00 |
|
Brian Behlendorf
|
8d0ab2e4a0
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 11:37:11 -08:00 |
|
Brian Behlendorf
|
bdd147eb8b
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 11:37:07 -08:00 |
|
Brian Behlendorf
|
3cf4e51b1c
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 11:36:55 -08:00 |
|
Brian Behlendorf
|
858f1f329a
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 11:36:39 -08:00 |
|
Brian Behlendorf
|
e0f0e02636
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:36:22 -08:00 |
|
Brian Behlendorf
|
5ea99efac7
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 11:36:20 -08:00 |
|
Brian Behlendorf
|
676ab35598
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-17 11:36:19 -08:00 |
|
Brian Behlendorf
|
0106dabb11
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-17 11:36:18 -08:00 |
|
Brian Behlendorf
|
a681d70e28
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 11:36:17 -08:00 |
|
Brian Behlendorf
|
e532f6bef4
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 11:36:16 -08:00 |
|
Brian Behlendorf
|
8af904a4b0
|
Resolve index shadowing /usr/include/string.h:304
|
2008-12-17 11:34:19 -08:00 |
|
Brian Behlendorf
|
ed9a35324d
|
Not sure why Sun needed to remove these externs, but I need them back
|
2008-12-17 11:32:47 -08:00 |
|
Brian Behlendorf
|
7c5c932505
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 11:28:54 -08:00 |
|
Brian Behlendorf
|
d8a55bcb89
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-17 11:28:46 -08:00 |
|
Brian Behlendorf
|
100e5ebb03
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 11:28:37 -08:00 |
|
Brian Behlendorf
|
199eaf1874
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 11:28:16 -08:00 |
|
Brian Behlendorf
|
2ad946619e
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 11:28:11 -08:00 |
|
Brian Behlendorf
|
44f4c483bc
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 11:28:07 -08:00 |
|
Brian Behlendorf
|
5cbfff3589
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 11:27:55 -08:00 |
|
Brian Behlendorf
|
a4b3bb43a9
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 11:27:40 -08:00 |
|
Brian Behlendorf
|
01e5ef8ebe
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:27:23 -08:00 |
|
Brian Behlendorf
|
25db7e9413
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 11:27:21 -08:00 |
|
Brian Behlendorf
|
935fd6c681
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 11:27:20 -08:00 |
|
Brian Behlendorf
|
55c8582174
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 11:27:19 -08:00 |
|
Brian Behlendorf
|
dcf0fb9ffb
|
Resolve shadow conflicts
|
2008-12-17 11:25:21 -08:00 |
|
Brian Behlendorf
|
3932b368f5
|
Refresh autogen products
|
2008-12-17 11:20:04 -08:00 |
|
Brian Behlendorf
|
38510987aa
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 11:19:30 -08:00 |
|
Brian Behlendorf
|
e5191c5ed5
|
Resolve conflict
|
2008-12-17 11:19:19 -08:00 |
|
Brian Behlendorf
|
a2b11e4955
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 11:18:33 -08:00 |
|
Brian Behlendorf
|
35257bfbd6
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 11:18:11 -08:00 |
|
Brian Behlendorf
|
47d0dbf5f6
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 11:18:07 -08:00 |
|
Brian Behlendorf
|
27448c8cdb
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 11:18:02 -08:00 |
|
Brian Behlendorf
|
6f2638f7a3
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 11:17:50 -08:00 |
|
Brian Behlendorf
|
8fd272bb0f
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 11:17:34 -08:00 |
|
Brian Behlendorf
|
746c17afcf
|
Resolve conflict
|
2008-12-17 11:16:41 -08:00 |
|
Brian Behlendorf
|
7973e77bfc
|
Re-add zpool (part of it), we need to build it for the common bits
|
2008-12-17 11:12:06 -08:00 |
|
Brian Behlendorf
|
1b7fa2b0b2
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 10:45:02 -08:00 |
|
Brian Behlendorf
|
1ef609d29e
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:45:00 -08:00 |
|
Brian Behlendorf
|
4291b2e02f
|
Add locale.h
|
2008-12-17 10:43:06 -08:00 |
|
Brian Behlendorf
|
3d74e14dda
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 10:12:34 -08:00 |
|
Brian Behlendorf
|
5ce03568c6
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:12:32 -08:00 |
|
Brian Behlendorf
|
e23605530a
|
Update #ifndef/#defines
|
2008-12-17 10:10:32 -08:00 |
|
Brian Behlendorf
|
6d524f2906
|
Cleanup some of the #ifndef/#defines
|
2008-12-17 10:06:55 -08:00 |
|
Brian Behlendorf
|
07394c4b64
|
Add mkdev.h rename _SOL_SYS to _LIBSPL_SYS
|
2008-12-17 10:04:04 -08:00 |
|
Brian Behlendorf
|
994a616c30
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-17 09:50:58 -08:00 |
|
Brian Behlendorf
|
204ec2e8f4
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:50:56 -08:00 |
|
Brian Behlendorf
|
0b7ef284bd
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:50:55 -08:00 |
|
Brian Behlendorf
|
bcbf74fead
|
Remove assert/verify support from zfs_context, moved to assert.h
|
2008-12-17 09:49:02 -08:00 |
|
Brian Behlendorf
|
5945ae3161
|
Move verify/assert userspace functionality to libspl to simply everything, this way it only lives in one place where you need to build with libzfs.h or zfs_context.h
|
2008-12-17 09:43:11 -08:00 |
|
Brian Behlendorf
|
d6ad828907
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 16:39:13 -08:00 |
|
Brian Behlendorf
|
5c9d50894c
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-16 16:39:02 -08:00 |
|
Brian Behlendorf
|
8ad2f7697a
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-16 16:38:48 -08:00 |
|
Brian Behlendorf
|
c76494c348
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-16 16:38:17 -08:00 |
|
Brian Behlendorf
|
daa6dfed96
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 16:37:05 -08:00 |
|
Brian Behlendorf
|
4ece62233d
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-16 16:36:52 -08:00 |
|
Brian Behlendorf
|
8f160abede
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-16 16:36:39 -08:00 |
|
Brian Behlendorf
|
8ffad5b6c0
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-16 16:35:57 -08:00 |
|
Brian Behlendorf
|
158d07270f
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-16 16:35:09 -08:00 |
|
Brian Behlendorf
|
715ac6ca88
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:34:16 -08:00 |
|
Brian Behlendorf
|
7453ec0f2c
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-16 16:34:09 -08:00 |
|
Brian Behlendorf
|
8bed8da925
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-16 16:34:07 -08:00 |
|
Brian Behlendorf
|
2d7f255945
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-16 16:34:04 -08:00 |
|
Brian Behlendorf
|
ebab24f633
|
Resolve shadow conflict
|
2008-12-16 16:26:50 -08:00 |
|
Brian Behlendorf
|
f1f205e15e
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 16:22:47 -08:00 |
|
Brian Behlendorf
|
2d271e7a94
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-16 16:22:42 -08:00 |
|
Brian Behlendorf
|
3d34904fbb
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-16 16:22:34 -08:00 |
|
Brian Behlendorf
|
750332e323
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-16 16:22:15 -08:00 |
|
Brian Behlendorf
|
015fcbe3b2
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 16:21:32 -08:00 |
|
Brian Behlendorf
|
5477876bdb
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-16 16:21:25 -08:00 |
|
Brian Behlendorf
|
a56dee01f5
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-16 16:21:17 -08:00 |
|
Brian Behlendorf
|
94dd45c46d
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-16 16:20:54 -08:00 |
|
Brian Behlendorf
|
b5550a0079
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-16 16:20:25 -08:00 |
|
Brian Behlendorf
|
6a902fe21c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:19:56 -08:00 |
|
Brian Behlendorf
|
f2bc2f7b6f
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-16 16:19:52 -08:00 |
|
Brian Behlendorf
|
fd4da48000
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-16 16:19:50 -08:00 |
|
Brian Behlendorf
|
29be0d44ba
|
Resolve conflict
|
2008-12-16 16:19:46 -08:00 |
|
Brian Behlendorf
|
4d21a1c977
|
Resolve two more shadow conflicts
|
2008-12-16 16:14:19 -08:00 |
|
Brian Behlendorf
|
71140ec4ac
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 16:10:20 -08:00 |
|
Brian Behlendorf
|
4ee4891d66
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:10:16 -08:00 |
|
Brian Behlendorf
|
862436f8c9
|
Strip out userspace interface to mount the FS. I need to talk about the right way to manage these changes with the lustre group at Sun, and see where they stand
|
2008-12-16 16:06:24 -08:00 |
|
Brian Behlendorf
|
ef733219dc
|
Refresh autogen products
|
2008-12-16 15:53:34 -08:00 |
|
Brian Behlendorf
|
26b307d0d0
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 15:52:53 -08:00 |
|
Brian Behlendorf
|
f50ed8e8c6
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-16 15:52:50 -08:00 |
|
Brian Behlendorf
|
1f5373d772
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-16 15:52:46 -08:00 |
|
Brian Behlendorf
|
cf408f0187
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-16 15:52:37 -08:00 |
|
Brian Behlendorf
|
70c7936ebf
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 15:52:15 -08:00 |
|
Brian Behlendorf
|
bad9c6965c
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-16 15:52:11 -08:00 |
|
Brian Behlendorf
|
afc91005b1
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-16 15:52:06 -08:00 |
|
Brian Behlendorf
|
cc53801767
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-16 15:51:54 -08:00 |
|
Brian Behlendorf
|
a77d20e66b
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-16 15:51:39 -08:00 |
|
Brian Behlendorf
|
e5000a1073
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:51:22 -08:00 |
|
Brian Behlendorf
|
12c13fbafb
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-16 15:51:20 -08:00 |
|
Brian Behlendorf
|
4583b6d5ba
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-16 15:51:19 -08:00 |
|
Brian Behlendorf
|
e14e140b52
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-16 15:51:19 -08:00 |
|
Brian Behlendorf
|
3c515284a6
|
Remove double declaration of char *
|
2008-12-16 15:49:21 -08:00 |
|
Brian Behlendorf
|
f73c835830
|
Add include patch to pick up fletcher.c which for some unknown reason is included instead of simply being build as source. This should be fixed eventually, but it is how the OpenSolaris source handles it.
|
2008-12-16 15:44:02 -08:00 |
|
Brian Behlendorf
|
4bed7d4e49
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 15:34:52 -08:00 |
|
Brian Behlendorf
|
7e43e16395
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:34:50 -08:00 |
|
Brian Behlendorf
|
35f607040f
|
Wrap additional new efi code in HAVE_LIBEFI macros
|
2008-12-16 15:33:00 -08:00 |
|
Brian Behlendorf
|
f1a115a43b
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 15:22:50 -08:00 |
|
Brian Behlendorf
|
6e002c41b8
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:22:48 -08:00 |
|
Brian Behlendorf
|
a3ea268b72
|
Add 2 missing headers
|
2008-12-16 15:20:56 -08:00 |
|
Brian Behlendorf
|
59a704e2e1
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 15:17:55 -08:00 |
|
Brian Behlendorf
|
ca161b928b
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:17:54 -08:00 |
|
Brian Behlendorf
|
36722eee12
|
Comment out most of the file until ZPL support arrives
|
2008-12-16 15:16:04 -08:00 |
|
Brian Behlendorf
|
618ef3269b
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 14:45:33 -08:00 |
|
Brian Behlendorf
|
6d01a82ce5
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:45:32 -08:00 |
|
Brian Behlendorf
|
ef919ac403
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:45:31 -08:00 |
|
Brian Behlendorf
|
66587f0fee
|
Remove all the share stuff
|
2008-12-16 14:43:38 -08:00 |
|
Brian Behlendorf
|
66cf9db3d0
|
Remove non-existing systeminfo ref
|
2008-12-16 14:38:52 -08:00 |
|
Brian Behlendorf
|
af860a0ef2
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 14:35:27 -08:00 |
|
Brian Behlendorf
|
646230294f
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-16 14:35:24 -08:00 |
|
Brian Behlendorf
|
1f0ad04f2d
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:35:21 -08:00 |
|
Brian Behlendorf
|
dbd5e397c5
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-16 14:35:20 -08:00 |
|
Brian Behlendorf
|
56692ac3aa
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-16 14:35:12 -08:00 |
|
Brian Behlendorf
|
e213f59844
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 14:34:51 -08:00 |
|
Brian Behlendorf
|
b17ad01f98
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-16 14:34:47 -08:00 |
|
Brian Behlendorf
|
5840198e26
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-16 14:34:43 -08:00 |
|
Brian Behlendorf
|
a4c93e56cc
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-16 14:34:31 -08:00 |
|
Brian Behlendorf
|
bb20fd94fc
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-16 14:34:17 -08:00 |
|
Brian Behlendorf
|
047a942f42
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:34:01 -08:00 |
|
Brian Behlendorf
|
79bc1b23ed
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-16 14:33:59 -08:00 |
|
Brian Behlendorf
|
804830a231
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-16 14:33:59 -08:00 |
|
Brian Behlendorf
|
a8a0f9ea2a
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-16 14:33:58 -08:00 |
|
Brian Behlendorf
|
9439fbdcd3
|
Add systeminfo
|
2008-12-16 14:32:03 -08:00 |
|
Brian Behlendorf
|
53c0cdbc42
|
Resolve dirname shadow conflict with /usr/include/libgen.h:27 dirname
|
2008-12-16 14:29:35 -08:00 |
|
Brian Behlendorf
|
01db543e50
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 14:24:24 -08:00 |
|
Brian Behlendorf
|
2c2372389a
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:24:23 -08:00 |
|
Brian Behlendorf
|
7df95c2f31
|
Add missing header
|
2008-12-16 14:22:31 -08:00 |
|
Brian Behlendorf
|
33dc3053c0
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 14:19:57 -08:00 |
|
Brian Behlendorf
|
e583bf8b9e
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:19:55 -08:00 |
|
Brian Behlendorf
|
f6207ec73a
|
Add missing headers
|
2008-12-16 14:17:29 -08:00 |
|
Brian Behlendorf
|
8417375410
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 14:12:50 -08:00 |
|
Brian Behlendorf
|
52a453edaa
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:12:48 -08:00 |
|
Brian Behlendorf
|
9df591c9d3
|
Add sys/mount.h header
|
2008-12-16 14:10:43 -08:00 |
|
Brian Behlendorf
|
a7eef78148
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 14:07:02 -08:00 |
|
Brian Behlendorf
|
554defd465
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:07:00 -08:00 |
|
Brian Behlendorf
|
12cb53ce52
|
Make SHARENFS condition with ZPL
|
2008-12-16 14:05:09 -08:00 |
|
Brian Behlendorf
|
2b2ceaed9b
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 13:31:49 -08:00 |
|
Brian Behlendorf
|
a07043191d
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-16 13:31:46 -08:00 |
|
Brian Behlendorf
|
ac3a2f3476
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-16 13:31:42 -08:00 |
|
Brian Behlendorf
|
9af5c86c0c
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-16 13:31:33 -08:00 |
|
Brian Behlendorf
|
33072dc1bc
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 13:31:13 -08:00 |
|
Brian Behlendorf
|
48b059e690
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-16 13:31:08 -08:00 |
|
Brian Behlendorf
|
2f68235cc8
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-16 13:31:04 -08:00 |
|
Brian Behlendorf
|
751ee4041e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-16 13:30:53 -08:00 |
|
Brian Behlendorf
|
8342056a8a
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-16 13:30:38 -08:00 |
|
Brian Behlendorf
|
1d4b1187d7
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:30:23 -08:00 |
|
Brian Behlendorf
|
527e38c72b
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-16 13:30:21 -08:00 |
|
Brian Behlendorf
|
34b937c016
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-16 13:30:21 -08:00 |
|
Brian Behlendorf
|
f693a600d0
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-16 13:30:20 -08:00 |
|
Brian Behlendorf
|
206a3ac58c
|
Resolve 2 more shadow conflicts
|
2008-12-16 13:28:23 -08:00 |
|
Brian Behlendorf
|
1eee786f73
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 13:22:51 -08:00 |
|
Brian Behlendorf
|
e8a56ea793
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-16 13:22:48 -08:00 |
|
Brian Behlendorf
|
e329093faf
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-16 13:22:44 -08:00 |
|
Brian Behlendorf
|
58645ef46d
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-16 13:22:36 -08:00 |
|
Brian Behlendorf
|
c78fdcb14a
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 13:22:15 -08:00 |
|
Brian Behlendorf
|
2bfe519e8b
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-16 13:22:11 -08:00 |
|
Brian Behlendorf
|
4a52a4dfb1
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-16 13:22:07 -08:00 |
|
Brian Behlendorf
|
d54cedd16c
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-16 13:21:55 -08:00 |
|
Brian Behlendorf
|
1d4d3c5fa8
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-16 13:21:41 -08:00 |
|
Brian Behlendorf
|
b22a5e18fe
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:21:25 -08:00 |
|
Brian Behlendorf
|
60ad9afc28
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-16 13:21:23 -08:00 |
|
Brian Behlendorf
|
5af8235e41
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-16 13:21:23 -08:00 |
|
Brian Behlendorf
|
f82621d7cb
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-16 13:19:26 -08:00 |
|
Brian Behlendorf
|
5383875500
|
Create gcc-shadow branch
|
2008-12-16 13:19:01 -08:00 |
|
Brian Behlendorf
|
e16553fdc8
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 10:16:02 -08:00 |
|
Brian Behlendorf
|
01918870b4
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-16 10:16:00 -08:00 |
|
Brian Behlendorf
|
e7d7f1803f
|
Remove unused hunk
|
2008-12-16 10:14:08 -08:00 |
|
Brian Behlendorf
|
fe0f9ebd5c
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 10:13:44 -08:00 |
|
Brian Behlendorf
|
3112028a39
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-16 10:13:43 -08:00 |
|
Brian Behlendorf
|
b62b556896
|
Moving unused hunk to unused patch
|
2008-12-16 10:11:41 -08:00 |
|
Brian Behlendorf
|
e7a0278475
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 09:57:20 -08:00 |
|
Brian Behlendorf
|
c26de31159
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 09:57:17 -08:00 |
|
Brian Behlendorf
|
e518437bbe
|
Add 3 missing headers
|
2008-12-16 09:54:42 -08:00 |
|
Brian Behlendorf
|
2e6486a1bf
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 09:45:17 -08:00 |
|
Brian Behlendorf
|
94d80663d7
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-16 09:43:38 -08:00 |
|
Brian Behlendorf
|
236abf7d17
|
Remove assfail() chunk, it just complicates things and is never used
|
2008-12-16 09:42:41 -08:00 |
|
Brian Behlendorf
|
4407c9249a
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 09:40:38 -08:00 |
|
Brian Behlendorf
|
4b3b2a56d2
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 09:40:35 -08:00 |
|
Brian Behlendorf
|
4d6a2499f6
|
Minor update to assert, pull include_next out of ifdef
|
2008-12-16 09:35:40 -08:00 |
|
Brian Behlendorf
|
d918e8e97d
|
Refresh autogen products
|
2008-12-16 09:12:43 -08:00 |
|
Brian Behlendorf
|
fada236349
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 09:11:01 -08:00 |
|
Brian Behlendorf
|
d5a8919126
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 09:10:58 -08:00 |
|
Brian Behlendorf
|
b0b1c43c46
|
Add += for DEFAULT_INCLUDES
|
2008-12-16 09:08:43 -08:00 |
|
Brian Behlendorf
|
b7374fc81b
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 09:06:51 -08:00 |
|
Brian Behlendorf
|
eb2a7c5200
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-16 09:06:37 -08:00 |
|
Brian Behlendorf
|
bf01b1ccdf
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-16 09:06:12 -08:00 |
|
Brian Behlendorf
|
4f488ec6e4
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-16 09:06:01 -08:00 |
|
Brian Behlendorf
|
151ee60cbf
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 09:05:02 -08:00 |
|
Brian Behlendorf
|
e07281deb9
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-16 09:04:47 -08:00 |
|
Brian Behlendorf
|
9fabbb14ad
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-16 09:04:35 -08:00 |
|
Brian Behlendorf
|
ef55a13da8
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-16 09:04:03 -08:00 |
|
Brian Behlendorf
|
589a6c72d6
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-16 09:03:27 -08:00 |
|
Brian Behlendorf
|
3ba34afff8
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-16 09:02:49 -08:00 |
|
Brian Behlendorf
|
a7b063d224
|
Add DEFAULT_INCLUDE to rules, adjust = to += accordingly
|
2008-12-16 08:58:41 -08:00 |
|
Brian Behlendorf
|
a3f0afc0b2
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 08:48:58 -08:00 |
|
Brian Behlendorf
|
c0abfccb28
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 08:48:49 -08:00 |
|
Brian Behlendorf
|
b74b9388b9
|
Add zfs_config include
|
2008-12-16 08:44:37 -08:00 |
|
Brian Behlendorf
|
bffca6c378
|
Refresh autogen products
|
2008-12-15 16:58:02 -08:00 |
|
Brian Behlendorf
|
aae097e010
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-15 10:02:35 -08:00 |
|
Brian Behlendorf
|
617be506e6
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:02:33 -08:00 |
|
Brian Behlendorf
|
5a17b1401d
|
Add unistd.h include config magic
|
2008-12-15 10:00:43 -08:00 |
|
Brian Behlendorf
|
b5e5c5c4a6
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-15 09:36:45 -08:00 |
|
Brian Behlendorf
|
4846f3140a
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 09:36:39 -08:00 |
|
Brian Behlendorf
|
5fd645e47a
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-15 09:36:37 -08:00 |
|
Brian Behlendorf
|
579f6e603f
|
Remove incorrect mapping from verify to assert. We should be using the more correct version in lib/libzpool/include/sys/zfs_context.h which will not optimize out the actual call in the assert based on NDEBUG
|
2008-12-15 09:29:26 -08:00 |
|
Brian Behlendorf
|
228b31e100
|
Add va_list include
|
2008-12-15 09:27:38 -08:00 |
|
Brian Behlendorf
|
7c2f9c0aae
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-15 09:12:49 -08:00 |
|
Brian Behlendorf
|
9e00f970ec
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 09:12:46 -08:00 |
|
Brian Behlendorf
|
e1357f07c0
|
Add libshare.h stub
|
2008-12-15 09:10:33 -08:00 |
|
Brian Behlendorf
|
ee209a7614
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 16:30:32 -08:00 |
|
Brian Behlendorf
|
b35bef8df2
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 16:29:31 -08:00 |
|
Brian Behlendorf
|
dc73ec2513
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 16:29:11 -08:00 |
|
Brian Behlendorf
|
5e125dc8b1
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 16:28:28 -08:00 |
|
Brian Behlendorf
|
bc2a0d3aac
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 16:28:18 -08:00 |
|
Brian Behlendorf
|
dbd7482662
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 16:28:07 -08:00 |
|
Brian Behlendorf
|
23302f57aa
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 16:27:40 -08:00 |
|
Brian Behlendorf
|
f73fee417e
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 16:27:04 -08:00 |
|
Brian Behlendorf
|
416157170a
|
Resolve conflict
|
2008-12-12 16:25:01 -08:00 |
|
Brian Behlendorf
|
0e8ac26fc9
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-12 16:23:07 -08:00 |
|
Brian Behlendorf
|
08a8860091
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-12 16:23:04 -08:00 |
|
Brian Behlendorf
|
eee73dd80e
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-12 16:22:59 -08:00 |
|
Brian Behlendorf
|
d0c573f27e
|
Add in the reset of the pthread changes
|
2008-12-12 16:16:06 -08:00 |
|
Brian Behlendorf
|
b7a979da7b
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 16:09:38 -08:00 |
|
Brian Behlendorf
|
c264712b93
|
Merge branch 'linux-context' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:09:33 -08:00 |
|
Brian Behlendorf
|
d07c7914a0
|
Refresh context for assert
|
2008-12-12 16:02:48 -08:00 |
|
Brian Behlendorf
|
9bc5ab5651
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 15:58:10 -08:00 |
|
Brian Behlendorf
|
6c859b40d7
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:58:07 -08:00 |
|
Brian Behlendorf
|
0c575736b6
|
Make this primatives conditional to not conflict with context
|
2008-12-12 15:56:06 -08:00 |
|
Brian Behlendorf
|
15218256e4
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 15:37:44 -08:00 |
|
Brian Behlendorf
|
b978916b98
|
Merge branch 'linux-context' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:36:18 -08:00 |
|
Brian Behlendorf
|
ac35c9f782
|
Minor verify tweak
|
2008-12-12 15:35:12 -08:00 |
|
Brian Behlendorf
|
ef88744480
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 15:28:33 -08:00 |
|
Brian Behlendorf
|
7b363155b3
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:28:31 -08:00 |
|
Brian Behlendorf
|
5b4fa8eb54
|
Revert libzfs hunk
|
2008-12-12 15:26:39 -08:00 |
|
Brian Behlendorf
|
a64c093aae
|
Refresh autogen products
|
2008-12-12 15:18:52 -08:00 |
|
Brian Behlendorf
|
f3e6ac6dc9
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 15:09:00 -08:00 |
|
Brian Behlendorf
|
a7b2b73c73
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 15:08:54 -08:00 |
|
Brian Behlendorf
|
6263035e10
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 15:08:32 -08:00 |
|
Brian Behlendorf
|
faf6c753bd
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 15:07:33 -08:00 |
|
Brian Behlendorf
|
f6421585ad
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 15:07:29 -08:00 |
|
Brian Behlendorf
|
a74ec0ff24
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 15:07:24 -08:00 |
|
Brian Behlendorf
|
54cb07032d
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 15:07:12 -08:00 |
|
Brian Behlendorf
|
2e7dffd82a
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 15:07:06 -08:00 |
|
Brian Behlendorf
|
8917e616ba
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 15:06:57 -08:00 |
|
Brian Behlendorf
|
3ce8541e83
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:06:41 -08:00 |
|
Brian Behlendorf
|
d145044d80
|
Refresh Makefile
|
2008-12-12 15:04:48 -08:00 |
|
Brian Behlendorf
|
d1837164f8
|
Refresh autogen products
|
2008-12-12 14:58:35 -08:00 |
|
Brian Behlendorf
|
634631bafe
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 14:57:51 -08:00 |
|
Brian Behlendorf
|
33ba2c56d1
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:57:48 -08:00 |
|
Brian Behlendorf
|
d7556c1578
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 14:57:47 -08:00 |
|
Brian Behlendorf
|
57dac8ad35
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 14:57:37 -08:00 |
|
Brian Behlendorf
|
9787903adb
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 14:57:13 -08:00 |
|
Brian Behlendorf
|
06a700c073
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 14:57:08 -08:00 |
|
Brian Behlendorf
|
1e0ff074a9
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 14:57:03 -08:00 |
|
Brian Behlendorf
|
f5a62035c7
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 14:56:50 -08:00 |
|
Brian Behlendorf
|
dc19f8860e
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 14:56:43 -08:00 |
|
Brian Behlendorf
|
d17d4bccd4
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 14:56:35 -08:00 |
|
Brian Behlendorf
|
d3ed0c4920
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:56:18 -08:00 |
|
Brian Behlendorf
|
f154348ca9
|
Update Makefile
|
2008-12-12 14:52:43 -08:00 |
|
Brian Behlendorf
|
8c4ed354ff
|
Add missing header
|
2008-12-12 14:51:46 -08:00 |
|
Brian Behlendorf
|
b6ddc3d1a3
|
Refreshed autogen products
|
2008-12-12 14:47:15 -08:00 |
|
Brian Behlendorf
|
8e833a1508
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 14:45:03 -08:00 |
|
Brian Behlendorf
|
67d05ea374
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:45:01 -08:00 |
|
Brian Behlendorf
|
1cdc368818
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 14:45:00 -08:00 |
|
Brian Behlendorf
|
9b1a5db258
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 14:44:51 -08:00 |
|
Brian Behlendorf
|
a955848091
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 14:44:30 -08:00 |
|
Brian Behlendorf
|
d36ee76b0c
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 14:44:25 -08:00 |
|
Brian Behlendorf
|
52044a9601
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 14:44:21 -08:00 |
|
Brian Behlendorf
|
96cb73d58b
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 14:44:09 -08:00 |
|
Brian Behlendorf
|
2085d7ed6e
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 14:44:02 -08:00 |
|
Brian Behlendorf
|
d2fb78a491
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 14:43:53 -08:00 |
|
Brian Behlendorf
|
17d90b5122
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:43:37 -08:00 |
|
Brian Behlendorf
|
f981fad7c1
|
Add 5 missing headers
|
2008-12-12 14:41:45 -08:00 |
|
Brian Behlendorf
|
cf89e6e4b3
|
Refresh Makefile
|
2008-12-12 14:37:13 -08:00 |
|
Brian Behlendorf
|
513e08f273
|
Refresh autogen products
|
2008-12-12 14:31:17 -08:00 |
|
Brian Behlendorf
|
3e21557c1c
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 14:30:22 -08:00 |
|
Brian Behlendorf
|
0dcb08e7fd
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 14:30:19 -08:00 |
|
Brian Behlendorf
|
b1af545c03
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 14:30:10 -08:00 |
|
Brian Behlendorf
|
eb18d4f4b2
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 14:29:48 -08:00 |
|
Brian Behlendorf
|
59af9d5f3d
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 14:29:44 -08:00 |
|
Brian Behlendorf
|
a7450f7d3e
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 14:29:40 -08:00 |
|
Brian Behlendorf
|
bb4f48461e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 14:29:28 -08:00 |
|
Brian Behlendorf
|
1cac8533a1
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 14:29:21 -08:00 |
|
Brian Behlendorf
|
73b709fa62
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 14:29:12 -08:00 |
|
Brian Behlendorf
|
00fa98c5cf
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:28:56 -08:00 |
|
Brian Behlendorf
|
50532fe67b
|
Refresh Makefile
|
2008-12-12 14:27:04 -08:00 |
|
Brian Behlendorf
|
2051c5740b
|
Refresh Makefile
|
2008-12-12 14:26:14 -08:00 |
|
Brian Behlendorf
|
a3cd490408
|
Refresh autogen products
|
2008-12-12 14:23:08 -08:00 |
|
Brian Behlendorf
|
47bdc6508d
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 14:22:31 -08:00 |
|
Brian Behlendorf
|
e0db7f116d
|
Resolve conflict
|
2008-12-12 14:22:23 -08:00 |
|
Brian Behlendorf
|
712ecbdc1c
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 14:21:47 -08:00 |
|
Brian Behlendorf
|
0adbfd4cfb
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 14:21:24 -08:00 |
|
Brian Behlendorf
|
bc55a1e29b
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 14:21:19 -08:00 |
|
Brian Behlendorf
|
9d3a835a0f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 14:21:14 -08:00 |
|
Brian Behlendorf
|
2db44f84d7
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 14:21:02 -08:00 |
|
Brian Behlendorf
|
948a4e0e2c
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 14:20:55 -08:00 |
|
Brian Behlendorf
|
ea758a9eea
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 14:20:46 -08:00 |
|
Brian Behlendorf
|
1bbe898289
|
Resolve conflict
|
2008-12-12 14:19:55 -08:00 |
|
Brian Behlendorf
|
5a27f3f0a5
|
Comment out libzpool builds for now
|
2008-12-12 14:16:50 -08:00 |
|
Brian Behlendorf
|
d062bba879
|
Refresh autogen products
|
2008-12-12 14:10:01 -08:00 |
|
Brian Behlendorf
|
1102724082
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 14:08:17 -08:00 |
|
Brian Behlendorf
|
1c38136eed
|
Resolve conflict
|
2008-12-12 14:08:10 -08:00 |
|
Brian Behlendorf
|
8429981d4d
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 14:02:24 -08:00 |
|
Brian Behlendorf
|
231e0793af
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 14:02:02 -08:00 |
|
Brian Behlendorf
|
d325eac85e
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 14:01:57 -08:00 |
|
Brian Behlendorf
|
4c62027f0f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 14:01:53 -08:00 |
|
Brian Behlendorf
|
326eb12f28
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 14:01:41 -08:00 |
|
Brian Behlendorf
|
a5880e88af
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 14:01:34 -08:00 |
|
Brian Behlendorf
|
f411872648
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 14:01:25 -08:00 |
|
Brian Behlendorf
|
09f348197e
|
Resolve conflict
|
2008-12-12 14:00:32 -08:00 |
|
Brian Behlendorf
|
01db09fde5
|
Collapse libzcommon in to libzpool
|
2008-12-12 13:57:47 -08:00 |
|
Brian Behlendorf
|
60a8ec8eeb
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 13:52:47 -08:00 |
|
Brian Behlendorf
|
a4fce46af9
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 13:52:44 -08:00 |
|
Brian Behlendorf
|
d5c06eeec8
|
Revert mutex changes
|
2008-12-12 13:50:45 -08:00 |
|
Brian Behlendorf
|
f7e63c25ea
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 13:40:17 -08:00 |
|
Brian Behlendorf
|
058cbf020f
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 13:40:15 -08:00 |
|
Brian Behlendorf
|
de9d49a2b4
|
Minor mutex tweaks
|
2008-12-12 13:38:13 -08:00 |
|
Brian Behlendorf
|
ffdd3b21d2
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 12:57:20 -08:00 |
|
Brian Behlendorf
|
ba611ca42d
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:57:18 -08:00 |
|
Brian Behlendorf
|
b127f72a15
|
Resolve mutex conflict
|
2008-12-12 12:55:33 -08:00 |
|
Brian Behlendorf
|
ab95bc7c7b
|
Add missing ;
|
2008-12-12 12:21:58 -08:00 |
|
Brian Behlendorf
|
52de958498
|
Refresh autogen products
|
2008-12-12 12:17:51 -08:00 |
|
Brian Behlendorf
|
42c94f3b60
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 12:16:50 -08:00 |
|
Brian Behlendorf
|
9d0fe1b6d9
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:16:43 -08:00 |
|
Brian Behlendorf
|
1ff495a2cc
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 12:16:41 -08:00 |
|
Brian Behlendorf
|
f3edbceddc
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 12:16:20 -08:00 |
|
Brian Behlendorf
|
3c0f20229e
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 12:15:31 -08:00 |
|
Brian Behlendorf
|
bcfa4f4d53
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 12:15:24 -08:00 |
|
Brian Behlendorf
|
4344da1fa3
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 12:15:16 -08:00 |
|
Brian Behlendorf
|
ea3adc331a
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 12:14:52 -08:00 |
|
Brian Behlendorf
|
4d9dd57c96
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 12:14:39 -08:00 |
|
Brian Behlendorf
|
3c36f366f0
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 12:14:19 -08:00 |
|
Brian Behlendorf
|
4d2cd6e70a
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 12:13:50 -08:00 |
|
Brian Behlendorf
|
ac9f5a5af0
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-12 12:13:43 -08:00 |
|
Brian Behlendorf
|
0f99484285
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-12 12:13:41 -08:00 |
|
Brian Behlendorf
|
95f0795156
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-12 12:13:39 -08:00 |
|
Brian Behlendorf
|
769681a8b9
|
Trivial umem implementation if portable umem unavailable
|
2008-12-12 12:10:00 -08:00 |
|
Brian Behlendorf
|
ea6e9380e7
|
Add void to prototype
|
2008-12-12 11:12:11 -08:00 |
|
Brian Behlendorf
|
c37a30080e
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 11:07:50 -08:00 |
|
Brian Behlendorf
|
bbaded4a68
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 11:07:48 -08:00 |
|
Brian Behlendorf
|
07973aa4b5
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 11:07:40 -08:00 |
|
Brian Behlendorf
|
3088684851
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 11:07:20 -08:00 |
|
Brian Behlendorf
|
c51c9226a5
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 11:07:16 -08:00 |
|
Brian Behlendorf
|
3d753d3be5
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 11:07:12 -08:00 |
|
Brian Behlendorf
|
1cb6a4e6e7
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 11:06:59 -08:00 |
|
Brian Behlendorf
|
58d3c91fa2
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 11:06:52 -08:00 |
|
Brian Behlendorf
|
86e0736858
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 11:06:44 -08:00 |
|
Brian Behlendorf
|
8a079bb853
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 11:06:29 -08:00 |
|
Brian Behlendorf
|
ded433714f
|
Refine Makefiles
|
2008-12-12 11:04:44 -08:00 |
|
Brian Behlendorf
|
12e7b2afab
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 11:00:10 -08:00 |
|
Brian Behlendorf
|
33833181c1
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 11:00:07 -08:00 |
|
Brian Behlendorf
|
39a0dfe6cf
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 10:59:59 -08:00 |
|
Brian Behlendorf
|
08f2e57b8c
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 10:59:38 -08:00 |
|
Brian Behlendorf
|
7e9bd9b2d7
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 10:59:34 -08:00 |
|
Brian Behlendorf
|
601b2d2c43
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 10:59:30 -08:00 |
|
Brian Behlendorf
|
4d54aed828
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 10:59:19 -08:00 |
|
Brian Behlendorf
|
775b36b66c
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 10:59:13 -08:00 |
|
Brian Behlendorf
|
8d9ea8f9d5
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 10:59:05 -08:00 |
|
Brian Behlendorf
|
da10598d26
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:58:50 -08:00 |
|
Brian Behlendorf
|
9fbc572a59
|
Refine Makefiles
|
2008-12-12 10:57:05 -08:00 |
|
Brian Behlendorf
|
8182ac40b1
|
Refresh autogen products
|
2008-12-12 10:49:23 -08:00 |
|
Brian Behlendorf
|
79edf81a7d
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 10:47:00 -08:00 |
|
Brian Behlendorf
|
bef1b1cd5b
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 10:45:38 -08:00 |
|
Brian Behlendorf
|
22c2a372b9
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 10:45:30 -08:00 |
|
Brian Behlendorf
|
266ab8c268
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 10:45:08 -08:00 |
|
Brian Behlendorf
|
6f0a0f1f5f
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 10:45:03 -08:00 |
|
Brian Behlendorf
|
c0e97ee28d
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 10:44:59 -08:00 |
|
Brian Behlendorf
|
3b0ebda451
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 10:44:49 -08:00 |
|
Brian Behlendorf
|
9d5e714ca4
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 10:44:43 -08:00 |
|
Brian Behlendorf
|
760b2a3f0f
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 10:44:35 -08:00 |
|
Brian Behlendorf
|
8aff6b7eec
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:44:20 -08:00 |
|
Brian Behlendorf
|
d7ec1ed532
|
Refine Makefiles
|
2008-12-12 10:43:39 -08:00 |
|
Brian Behlendorf
|
ee37692b41
|
Refresh autogen products
|
2008-12-12 10:40:02 -08:00 |
|
Brian Behlendorf
|
1f5295bc51
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 10:38:53 -08:00 |
|
Brian Behlendorf
|
6d0d603ee1
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 10:38:51 -08:00 |
|
Brian Behlendorf
|
9a30c4847f
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 10:38:43 -08:00 |
|
Brian Behlendorf
|
92afe68367
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 10:38:23 -08:00 |
|
Brian Behlendorf
|
5b7cbb0234
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 10:38:19 -08:00 |
|
Brian Behlendorf
|
d7ac648d3e
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 10:38:15 -08:00 |
|
Brian Behlendorf
|
7eb016ef42
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 10:38:04 -08:00 |
|
Brian Behlendorf
|
58842db464
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 10:37:58 -08:00 |
|
Brian Behlendorf
|
4ffa0c8e19
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 10:37:49 -08:00 |
|
Brian Behlendorf
|
d7761f89ae
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:37:35 -08:00 |
|
Brian Behlendorf
|
76e1c54125
|
Refine Makefiles
|
2008-12-12 10:36:14 -08:00 |
|
Brian Behlendorf
|
7297c6d959
|
Refresh autogen products
|
2008-12-12 10:31:54 -08:00 |
|
Brian Behlendorf
|
1aa5fd7397
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 10:30:39 -08:00 |
|
Brian Behlendorf
|
323d5b5414
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:30:38 -08:00 |
|
Brian Behlendorf
|
d06634c325
|
Resolve shadow conflict with 'link' local
|
2008-12-12 10:24:38 -08:00 |
|
Brian Behlendorf
|
609680b177
|
Refresh autogen products
|
2008-12-12 10:20:55 -08:00 |
|
Brian Behlendorf
|
9d9b8827d0
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 10:13:21 -08:00 |
|
Brian Behlendorf
|
662df0d70a
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 10:13:19 -08:00 |
|
Brian Behlendorf
|
78d663ba36
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 10:13:11 -08:00 |
|
Brian Behlendorf
|
30b11b1bb0
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 10:12:51 -08:00 |
|
Brian Behlendorf
|
87935f5077
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 10:12:47 -08:00 |
|
Brian Behlendorf
|
f2ecf35ad6
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 10:12:43 -08:00 |
|
Brian Behlendorf
|
4846b5850f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 10:12:32 -08:00 |
|
Brian Behlendorf
|
9ca1163310
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 10:12:26 -08:00 |
|
Brian Behlendorf
|
adbfba8f2a
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 10:12:18 -08:00 |
|
Brian Behlendorf
|
9a4109a11c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 10:12:03 -08:00 |
|
Brian Behlendorf
|
6d78e69193
|
Add missing include patch
|
2008-12-12 10:10:16 -08:00 |
|
Brian Behlendorf
|
371162346a
|
Add autogen products
|
2008-12-12 09:35:47 -08:00 |
|
Brian Behlendorf
|
212ec0c394
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-12 09:34:36 -08:00 |
|
Brian Behlendorf
|
5664869614
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 09:34:35 -08:00 |
|
Brian Behlendorf
|
2e0a5f5461
|
Refresh makefiles and configure.ac
|
2008-12-12 09:30:42 -08:00 |
|
Brian Behlendorf
|
3b4adb0abd
|
Add all autogen products
|
2008-12-12 09:25:06 -08:00 |
|
Brian Behlendorf
|
983c10c8c1
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 09:23:36 -08:00 |
|
Brian Behlendorf
|
450502ec0b
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 09:23:28 -08:00 |
|
Brian Behlendorf
|
bc031993d7
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 09:23:08 -08:00 |
|
Brian Behlendorf
|
efbf9637d4
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 09:23:03 -08:00 |
|
Brian Behlendorf
|
2ad15bb834
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 09:22:59 -08:00 |
|
Brian Behlendorf
|
8516e2d45e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 09:22:48 -08:00 |
|
Brian Behlendorf
|
fdb922a832
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 09:22:42 -08:00 |
|
Brian Behlendorf
|
7f2347ed6c
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 09:22:34 -08:00 |
|
Brian Behlendorf
|
c1a800e4c5
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 09:22:19 -08:00 |
|
Brian Behlendorf
|
7005de9a0c
|
Refresh Makefile.am's
|
2008-12-12 09:20:33 -08:00 |
|
Brian Behlendorf
|
85e026f310
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 08:53:32 -08:00 |
|
Brian Behlendorf
|
06c36a4115
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 08:53:24 -08:00 |
|
Brian Behlendorf
|
370d47306c
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 08:53:03 -08:00 |
|
Brian Behlendorf
|
c87484ff9a
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 08:52:58 -08:00 |
|
Brian Behlendorf
|
5522b00069
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 08:52:54 -08:00 |
|
Brian Behlendorf
|
86b3bb18c3
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 08:52:43 -08:00 |
|
Brian Behlendorf
|
6955ffc56e
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 08:52:37 -08:00 |
|
Brian Behlendorf
|
579ce8f9b7
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 08:52:28 -08:00 |
|
Brian Behlendorf
|
9e66117d33
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 08:52:13 -08:00 |
|
Brian Behlendorf
|
d4ae03c700
|
Add initial stub makefile, details need filling in
|
2008-12-12 08:50:07 -08:00 |
|
Brian Behlendorf
|
30c38654e4
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:49:42 -08:00 |
|
Brian Behlendorf
|
3540a5e4e5
|
Readd
|
2008-12-11 16:46:07 -08:00 |
|
Brian Behlendorf
|
e0104bd422
|
Remove so they can be easily readded
|
2008-12-11 16:41:23 -08:00 |
|
Brian Behlendorf
|
a5ea185d73
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:35:33 -08:00 |
|
Brian Behlendorf
|
e7ffc42caf
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-11 16:35:24 -08:00 |
|
Brian Behlendorf
|
9f20c1541f
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-11 16:34:42 -08:00 |
|
Brian Behlendorf
|
028e88ac61
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-11 16:34:34 -08:00 |
|
Brian Behlendorf
|
2ae6a4865f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-11 16:34:25 -08:00 |
|
Brian Behlendorf
|
c95fabb9c7
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-11 16:33:58 -08:00 |
|
Brian Behlendorf
|
fe1de9437c
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-11 16:33:44 -08:00 |
|
Brian Behlendorf
|
5fd7f8a200
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-11 16:33:28 -08:00 |
|
Brian Behlendorf
|
a0914f2770
|
Refresh
|
2008-12-11 16:31:44 -08:00 |
|
Brian Behlendorf
|
a928ca95fc
|
Add to Makefile.am
|
2008-12-11 16:25:33 -08:00 |
|
Brian Behlendorf
|
9eb741a1fe
|
Readd missing header
|
2008-12-11 16:23:35 -08:00 |
|
Brian Behlendorf
|
a0e625a878
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-11 15:41:52 -08:00 |
|
Brian Behlendorf
|
182754d11a
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-11 15:41:48 -08:00 |
|
Brian Behlendorf
|
d35a0f25fe
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2008-12-11 15:41:45 -08:00 |
|
Brian Behlendorf
|
dd32efe6ef
|
Resolve conflict
|
2008-12-11 15:41:42 -08:00 |
|
Brian Behlendorf
|
b8224d752e
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2008-12-11 15:41:29 -08:00 |
|
Brian Behlendorf
|
7e85cefdc5
|
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
|
2008-12-11 15:41:28 -08:00 |
|
Brian Behlendorf
|
d8ab98ca3c
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2008-12-11 15:41:23 -08:00 |
|
Brian Behlendorf
|
1ccd0b2b09
|
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
|
2008-12-11 15:40:37 -08:00 |
|
Brian Behlendorf
|
aa42812a3d
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2008-12-11 15:40:32 -08:00 |
|
Brian Behlendorf
|
3751fd87e3
|
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
|
2008-12-11 15:40:25 -08:00 |
|
Brian Behlendorf
|
57799b7b5a
|
Resolve conflict
|
2008-12-11 15:40:14 -08:00 |
|
Brian Behlendorf
|
3399113552
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-11 15:39:25 -08:00 |
|
Brian Behlendorf
|
6b2c60acca
|
Moving lib/libspl to linux-libspl branch
|
2008-12-11 15:38:59 -08:00 |
|
Brian Behlendorf
|
1d99f33ba7
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-11 15:37:37 -08:00 |
|
Brian Behlendorf
|
28c80747e6
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-11 15:37:29 -08:00 |
|
Brian Behlendorf
|
c2ccbc5a94
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-11 15:37:10 -08:00 |
|
Brian Behlendorf
|
b4e3a4f70d
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-11 15:37:06 -08:00 |
|
Brian Behlendorf
|
98e19f56b5
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-11 15:37:02 -08:00 |
|
Brian Behlendorf
|
e24a59a697
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-11 15:36:51 -08:00 |
|
Brian Behlendorf
|
f3dc282dd1
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-11 15:36:45 -08:00 |
|
Brian Behlendorf
|
ee17768d94
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-11 15:36:38 -08:00 |
|
Brian Behlendorf
|
2b86faed0a
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:36:23 -08:00 |
|
Brian Behlendorf
|
cf06f2f58f
|
Whoops put these back
|
2008-12-11 15:34:32 -08:00 |
|
Brian Behlendorf
|
652388f3fb
|
Moving all lib/libspl contexts to linux-libspl branch
|
2008-12-11 15:31:48 -08:00 |
|
Brian Behlendorf
|
9245824527
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:08:23 -08:00 |
|
Brian Behlendorf
|
d46b60f374
|
Move libspl to new location
|
2008-12-11 15:06:34 -08:00 |
|
Brian Behlendorf
|
be5e4ee04f
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-11 15:00:50 -08:00 |
|
Brian Behlendorf
|
686c93db12
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-11 15:00:23 -08:00 |
|
Brian Behlendorf
|
477a85d905
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-11 15:00:01 -08:00 |
|
Brian Behlendorf
|
6d37a4ad97
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-11 14:59:57 -08:00 |
|
Brian Behlendorf
|
d68cecbb9d
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-11 14:59:52 -08:00 |
|
Brian Behlendorf
|
515c1981f2
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-11 14:59:39 -08:00 |
|
Brian Behlendorf
|
f46d4ce0a4
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-11 14:59:32 -08:00 |
|
Brian Behlendorf
|
f27584417a
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-11 14:59:24 -08:00 |
|
Brian Behlendorf
|
a3c66a6b89
|
Resolve conflict
|
2008-12-11 14:58:34 -08:00 |
|
Brian Behlendorf
|
593aa3e10d
|
Move all current Makefiles to correct locations, updates still needed
|
2008-12-11 14:55:55 -08:00 |
|
Brian Behlendorf
|
a4a44a76d4
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-11 14:27:09 -08:00 |
|
Brian Behlendorf
|
a11327542c
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-11 14:26:58 -08:00 |
|
Brian Behlendorf
|
2bcfa6809c
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-11 14:26:34 -08:00 |
|
Brian Behlendorf
|
4ebd4f1f00
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-11 14:26:29 -08:00 |
|
Brian Behlendorf
|
45ea2016b4
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-11 14:26:24 -08:00 |
|
Brian Behlendorf
|
8f8a7e587a
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-11 14:26:10 -08:00 |
|
Brian Behlendorf
|
c5c9d459a5
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-11 14:26:03 -08:00 |
|
Brian Behlendorf
|
b2e6f14250
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-11 14:25:53 -08:00 |
|
Brian Behlendorf
|
3bd537afcc
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:25:35 -08:00 |
|
Brian Behlendorf
|
503068ecec
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-11 14:25:32 -08:00 |
|
Brian Behlendorf
|
6bc8988bec
|
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
|
2008-12-11 14:25:21 -08:00 |
|
Brian Behlendorf
|
13d572f7bc
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2008-12-11 14:25:15 -08:00 |
|
Brian Behlendorf
|
1e849d9b3b
|
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
|
2008-12-11 14:25:08 -08:00 |
|
Brian Behlendorf
|
b8294b1311
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-11 14:25:05 -08:00 |
|
Brian Behlendorf
|
022db7f816
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2008-12-11 14:25:01 -08:00 |
|
Brian Behlendorf
|
ec2b4ef2ed
|
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
|
2008-12-11 14:24:59 -08:00 |
|
Brian Behlendorf
|
9af6637db5
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2008-12-11 14:24:57 -08:00 |
|
Brian Behlendorf
|
c325ac879c
|
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
|
2008-12-11 14:24:56 -08:00 |
|
Brian Behlendorf
|
3e2988aa8b
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2008-12-11 14:24:50 -08:00 |
|
Brian Behlendorf
|
82c8f9af50
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-11 14:24:49 -08:00 |
|
Brian Behlendorf
|
9b3c631dbd
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-11 14:24:48 -08:00 |
|
Brian Behlendorf
|
a4076c7544
|
Script updates
|
2008-12-11 14:21:14 -08:00 |
|
Brian Behlendorf
|
c4911ece24
|
Move library files to lib
|
2008-12-11 14:16:55 -08:00 |
|
Brian Behlendorf
|
a400443ecf
|
Resolve conflict
|
2008-12-11 14:07:08 -08:00 |
|
Brian Behlendorf
|
8ca859a47b
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-11 14:05:44 -08:00 |
|
Brian Behlendorf
|
31927647a8
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-11 14:05:18 -08:00 |
|
Brian Behlendorf
|
b9c746ed0b
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-11 14:05:13 -08:00 |
|
Brian Behlendorf
|
fdff27558a
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-11 14:05:08 -08:00 |
|
Brian Behlendorf
|
94e1055395
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-11 14:04:54 -08:00 |
|
Brian Behlendorf
|
4d8fd75005
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-11 14:04:46 -08:00 |
|
Brian Behlendorf
|
3ab9fee91c
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-11 14:04:35 -08:00 |
|
Brian Behlendorf
|
44ffa43709
|
Resolve conflict
|
2008-12-11 14:01:47 -08:00 |
|
Brian Behlendorf
|
98ce19f04c
|
Update avl, nvpair, spl to unique build dirs
|
2008-12-11 13:54:57 -08:00 |
|
Brian Behlendorf
|
8b20091dda
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-11 11:47:54 -08:00 |
|
Brian Behlendorf
|
645c51287f
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-11 11:37:35 -08:00 |
|
Brian Behlendorf
|
11e1ce8c2e
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-11 11:36:50 -08:00 |
|
Brian Behlendorf
|
076f7c6a5f
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-11 11:36:40 -08:00 |
|
Brian Behlendorf
|
7515df142f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-11 11:36:31 -08:00 |
|
Brian Behlendorf
|
5bb8f9ec25
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-11 11:36:00 -08:00 |
|
Brian Behlendorf
|
4003bc5b2c
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-11 11:35:48 -08:00 |
|
Brian Behlendorf
|
1b0348e335
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-11 11:35:29 -08:00 |
|
Brian Behlendorf
|
aca9d98817
|
Fix conflict
|
2008-12-11 11:34:16 -08:00 |
|
Brian Behlendorf
|
f07f82e93a
|
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
|
2008-12-11 11:26:43 -08:00 |
|
Brian Behlendorf
|
3053990c38
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2008-12-11 11:26:19 -08:00 |
|
Brian Behlendorf
|
84e65c5c1e
|
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
|
2008-12-11 11:25:50 -08:00 |
|
Brian Behlendorf
|
756a122d37
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-11 11:25:42 -08:00 |
|
Brian Behlendorf
|
d6ccbb14c5
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2008-12-11 11:25:28 -08:00 |
|
Brian Behlendorf
|
ff282a978f
|
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
|
2008-12-11 11:25:22 -08:00 |
|
Brian Behlendorf
|
cdd670cb2f
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2008-12-11 11:25:15 -08:00 |
|
Brian Behlendorf
|
8f8ac4288f
|
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
|
2008-12-11 11:25:09 -08:00 |
|
Brian Behlendorf
|
b342e90e44
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2008-12-11 11:24:51 -08:00 |
|
Brian Behlendorf
|
4f5d567cfd
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-11 11:24:45 -08:00 |
|
Brian Behlendorf
|
3420896332
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-11 11:24:42 -08:00 |
|
Brian Behlendorf
|
b453b61272
|
Fix libspl move to the wrong place
|
2008-12-11 11:22:02 -08:00 |
|
Brian Behlendorf
|
77755a5771
|
Add a few missing files
|
2008-12-11 11:14:49 -08:00 |
|
Brian Behlendorf
|
172bb4bd5e
|
Move the world out of /zfs/ and seperate out module build tree
|
2008-12-11 11:08:09 -08:00 |
|
Brian Behlendorf
|
b6097ae55a
|
Remove stray stub kernel files which should be brought in my linux-kernel-module patch
|
2008-12-02 08:47:21 -08:00 |
|
Brian Behlendorf
|
34dc7c2f25
|
Initial Linux ZFS GIT Repo
|
2008-11-20 12:01:55 -08:00 |