Brian Behlendorf
|
c15fa0ceb0
|
Add include paths
|
2009-01-05 13:44:26 -08:00 |
|
Brian Behlendorf
|
35cfc1bb85
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-05 12:45:38 -08:00 |
|
Brian Behlendorf
|
0f742dfc96
|
Refresh context
|
2009-01-05 12:45:17 -08:00 |
|
Brian Behlendorf
|
681ba5c296
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-05 12:41:42 -08:00 |
|
Brian Behlendorf
|
d5350109f4
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-05 12:40:55 -08:00 |
|
Brian Behlendorf
|
6ce317a8d5
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 12:40:48 -08:00 |
|
Brian Behlendorf
|
9c2bf69ecb
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 12:40:25 -08:00 |
|
Brian Behlendorf
|
c8fa7c9b23
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-05 12:39:56 -08:00 |
|
Brian Behlendorf
|
9a0cb95b1b
|
Resolve conflict
|
2009-01-05 12:38:23 -08:00 |
|
Brian Behlendorf
|
ce7115b807
|
Add unicode makefile references and support
|
2009-01-05 12:33:09 -08:00 |
|
Brian Behlendorf
|
ced77c2f1b
|
Add unicode makefile references and support
|
2009-01-05 12:32:55 -08:00 |
|
Brian Behlendorf
|
1b327abcfd
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-05 11:54:52 -08:00 |
|
Brian Behlendorf
|
3d2e086e21
|
Remove u8 support, moved to libu8
|
2009-01-05 11:52:51 -08:00 |
|
Brian Behlendorf
|
50735743b7
|
Err undo that
|
2008-12-22 16:22:28 -08:00 |
|
Brian Behlendorf
|
bb128e51e6
|
Use thread so we can add other goodies beyond simply the pthread base
|
2008-12-22 16:20:36 -08:00 |
|
Brian Behlendorf
|
53f2b61ce1
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:21:10 -08:00 |
|
Brian Behlendorf
|
89585b82fa
|
Add missing limits
|
2008-12-22 15:17:57 -08:00 |
|
Brian Behlendorf
|
3251158230
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 15:06:42 -08:00 |
|
Brian Behlendorf
|
091c16c185
|
Add missing tzfile.h
|
2008-12-22 15:04:47 -08:00 |
|
Brian Behlendorf
|
314e57ba29
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 14:59:06 -08:00 |
|
Brian Behlendorf
|
b0704f1597
|
Add missing header for ztest
|
2008-12-22 14:57:15 -08:00 |
|
Brian Behlendorf
|
97e7199aaf
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-22 14:45:43 -08:00 |
|
Brian Behlendorf
|
ef6c136edb
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-22 14:45:33 -08:00 |
|
Brian Behlendorf
|
fccd2786e1
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 14:45:23 -08:00 |
|
Brian Behlendorf
|
12573fb5b9
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 14:44:59 -08:00 |
|
Brian Behlendorf
|
c267d86b09
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 14:44:55 -08:00 |
|
Brian Behlendorf
|
16d3bec487
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 14:44:42 -08:00 |
|
Brian Behlendorf
|
997a274a13
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 14:44:25 -08:00 |
|
Brian Behlendorf
|
ff8a2f61ff
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 14:44:07 -08:00 |
|
Brian Behlendorf
|
29b47d366e
|
Remove some headers
|
2008-12-22 14:42:02 -08:00 |
|
Brian Behlendorf
|
139792e6b2
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-22 13:53:03 -08:00 |
|
Brian Behlendorf
|
fa078fa9dd
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-22 13:52:53 -08:00 |
|
Brian Behlendorf
|
7edc6e24a8
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 13:52:42 -08:00 |
|
Brian Behlendorf
|
262e367cd5
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 13:52:16 -08:00 |
|
Brian Behlendorf
|
877699acb1
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 13:52:11 -08:00 |
|
Brian Behlendorf
|
1f72057409
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 13:51:57 -08:00 |
|
Brian Behlendorf
|
52bfcda357
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 13:51:39 -08:00 |
|
Brian Behlendorf
|
05fafc638f
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:51:21 -08:00 |
|
Brian Behlendorf
|
90e5216ea9
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 13:51:17 -08:00 |
|
Brian Behlendorf
|
035e4d373e
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-22 13:51:16 -08:00 |
|
Brian Behlendorf
|
c9597f9a4f
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-22 13:51:15 -08:00 |
|
Brian Behlendorf
|
6bed331e59
|
More compat changes
|
2008-12-22 13:47:58 -08:00 |
|
Brian Behlendorf
|
0789abcd67
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-22 12:55:06 -08:00 |
|
Brian Behlendorf
|
57e03b4986
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-22 12:54:57 -08:00 |
|
Brian Behlendorf
|
bc90a3635d
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 12:54:46 -08:00 |
|
Brian Behlendorf
|
a40064cfd1
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 12:54:21 -08:00 |
|
Brian Behlendorf
|
b7770e3b13
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 12:54:16 -08:00 |
|
Brian Behlendorf
|
34f30113a8
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 12:54:03 -08:00 |
|
Brian Behlendorf
|
195c61d105
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 12:53:46 -08:00 |
|
Brian Behlendorf
|
b93191445c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:53:27 -08:00 |
|
Brian Behlendorf
|
121effcbee
|
Pull everything in to the Makefile
|
2008-12-22 12:51:03 -08:00 |
|
Brian Behlendorf
|
1e9c6b3020
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:24:47 -08:00 |
|
Brian Behlendorf
|
79491b69f4
|
Start linux-have-zpl layer
|
2008-12-22 12:23:27 -08:00 |
|
Brian Behlendorf
|
a6d6f31db6
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:09:08 -08:00 |
|
Brian Behlendorf
|
d7d260b870
|
Removing branch to readd under new name
|
2008-12-22 12:05:11 -08:00 |
|
Brian Behlendorf
|
d7fafdb56e
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-22 11:42:23 -08:00 |
|
Brian Behlendorf
|
300ff503d4
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 11:42:13 -08:00 |
|
Brian Behlendorf
|
7b4bf789e9
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-22 11:41:50 -08:00 |
|
Brian Behlendorf
|
6d13a998fb
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 11:41:45 -08:00 |
|
Brian Behlendorf
|
86392b70ad
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 11:41:40 -08:00 |
|
Brian Behlendorf
|
187be3051e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 11:41:27 -08:00 |
|
Brian Behlendorf
|
7f2da73568
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 11:41:11 -08:00 |
|
Brian Behlendorf
|
aece7f6822
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:40:54 -08:00 |
|
Brian Behlendorf
|
7047bb0678
|
Add missing files from Makefile.am
|
2008-12-22 11:36:48 -08:00 |
|
Brian Behlendorf
|
01dee27561
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:37:44 -08:00 |
|
Brian Behlendorf
|
4e564d755b
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-22 10:37:42 -08:00 |
|
Brian Behlendorf
|
7e800d8125
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-22 10:37:33 -08:00 |
|
Brian Behlendorf
|
8ad9104988
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-22 10:37:10 -08:00 |
|
Brian Behlendorf
|
5169758856
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 10:37:05 -08:00 |
|
Brian Behlendorf
|
c6e93310af
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 10:37:00 -08:00 |
|
Brian Behlendorf
|
bdbd91fe46
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 10:36:48 -08:00 |
|
Brian Behlendorf
|
11147f632c
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-22 10:36:32 -08:00 |
|
Brian Behlendorf
|
9c47372b96
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:36:15 -08:00 |
|
Brian Behlendorf
|
5f0a629790
|
Add enable_extended_FILE_stdio #define
|
2008-12-22 10:34:22 -08:00 |
|
Brian Behlendorf
|
10911f9d71
|
Add missing sources
|
2008-12-22 10:27:41 -08:00 |
|
Brian Behlendorf
|
42344f04c1
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:15:20 -08:00 |
|
Brian Behlendorf
|
8fdc6ee079
|
Stub out two more funcs until zpl support exists
|
2008-12-22 10:13:31 -08:00 |
|
Brian Behlendorf
|
0ecac4865c
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:03:22 -08:00 |
|
Brian Behlendorf
|
e8b703cb46
|
Add sys/time.h
|
2008-12-22 10:00:01 -08:00 |
|
Brian Behlendorf
|
783faf9040
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:57:45 -08:00 |
|
Brian Behlendorf
|
6d9b733aab
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-19 16:57:43 -08:00 |
|
Brian Behlendorf
|
c2177925af
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 16:57:23 -08:00 |
|
Brian Behlendorf
|
1a2361c2d7
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 16:56:39 -08:00 |
|
Brian Behlendorf
|
1963e197a7
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 16:56:31 -08:00 |
|
Brian Behlendorf
|
e8676f2c5f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 16:56:24 -08:00 |
|
Brian Behlendorf
|
2e8b703fff
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 16:56:03 -08:00 |
|
Brian Behlendorf
|
96e85b9e96
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-19 16:55:34 -08:00 |
|
Brian Behlendorf
|
4420db3d37
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:55:00 -08:00 |
|
Brian Behlendorf
|
60289ccd8f
|
Add zfs_byteswap
|
2008-12-19 16:51:14 -08:00 |
|
Brian Behlendorf
|
ae21fcad1c
|
Add missing acl files
|
2008-12-19 16:49:31 -08:00 |
|
Brian Behlendorf
|
252ef2053c
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-19 16:36:02 -08:00 |
|
Brian Behlendorf
|
06d461ee7b
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 16:35:43 -08:00 |
|
Brian Behlendorf
|
8806156f06
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 16:34:57 -08:00 |
|
Brian Behlendorf
|
6fdfd55847
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 16:34:48 -08:00 |
|
Brian Behlendorf
|
3f0c49cfa4
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 16:34:38 -08:00 |
|
Brian Behlendorf
|
cbc70456f1
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 16:34:10 -08:00 |
|
Brian Behlendorf
|
0868f08291
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-19 16:33:37 -08:00 |
|
Brian Behlendorf
|
809ca413e5
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:33:03 -08:00 |
|
Brian Behlendorf
|
96813619bf
|
Pull in new background scrubber
|
2008-12-19 16:29:13 -08:00 |
|
Brian Behlendorf
|
6f718e396c
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:27:08 -08:00 |
|
Brian Behlendorf
|
50c5923533
|
Resolve lingering atomic asm build issues. I think
|
2008-12-19 16:23:26 -08:00 |
|
Brian Behlendorf
|
449c6c9e8b
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:11:13 -08:00 |
|
Brian Behlendorf
|
0581ade42b
|
Add target_cpu
|
2008-12-19 16:07:26 -08:00 |
|
Brian Behlendorf
|
1974fe42c2
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:03:07 -08:00 |
|
Brian Behlendorf
|
b66eafc892
|
Add assembler flags
|
2008-12-19 15:56:04 -08:00 |
|
Brian Behlendorf
|
23eb8e4234
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 15:13:32 -08:00 |
|
Brian Behlendorf
|
febd743891
|
First pass at getting userspace 64bit atomic ops working:
|
2008-12-19 15:11:43 -08:00 |
|
Brian Behlendorf
|
8dbb32f117
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 13:58:44 -08:00 |
|
Brian Behlendorf
|
545f76d526
|
Add P2BOUNDARY macro
|
2008-12-19 13:56:55 -08:00 |
|
Brian Behlendorf
|
d6013ca22b
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-19 13:38:47 -08:00 |
|
Brian Behlendorf
|
3579c5ac5a
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 13:38:38 -08:00 |
|
Brian Behlendorf
|
fbc711944c
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 13:38:16 -08:00 |
|
Brian Behlendorf
|
f4ff14afdb
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 13:38:11 -08:00 |
|
Brian Behlendorf
|
0127d5e65b
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 13:38:07 -08:00 |
|
Brian Behlendorf
|
4679c1631c
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 13:37:55 -08:00 |
|
Brian Behlendorf
|
102a98af37
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-19 13:37:40 -08:00 |
|
Brian Behlendorf
|
d1f5be0b8b
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 13:37:23 -08:00 |
|
Brian Behlendorf
|
8ab575cd8e
|
Remove vdev_disk.c from userspace build, we simply use vdev_file.c here
|
2008-12-19 13:35:29 -08:00 |
|
Brian Behlendorf
|
b95f799218
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 13:16:48 -08:00 |
|
Brian Behlendorf
|
28edfc91c8
|
Add compress header
|
2008-12-19 13:14:49 -08:00 |
|
Brian Behlendorf
|
338dd65c10
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 12:40:02 -08:00 |
|
Brian Behlendorf
|
b86297e4d3
|
Add missing umem bits
|
2008-12-19 12:32:08 -08:00 |
|
Brian Behlendorf
|
553ed5a642
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 12:22:08 -08:00 |
|
Brian Behlendorf
|
55c0063df6
|
Add 2 more headers where are missing
|
2008-12-19 12:18:59 -08:00 |
|
Brian Behlendorf
|
0b750e64a3
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 12:11:12 -08:00 |
|
Brian Behlendorf
|
87dc99c933
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-19 12:11:09 -08:00 |
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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 |