9d4d22a26e
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-02-18 15:20:08 -08:00
8c228734a3
Fix cast
2009-02-18 15:15:56 -08:00
7b8eca908f
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
...
Conflicts:
cmd/zpool/zpool_main.c
2009-02-18 14:38:20 -08:00
181fd4addc
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-02-18 14:37:16 -08:00
437bc77985
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-02-18 14:36:49 -08:00
be3ffc5f9e
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-02-18 14:36:16 -08:00
ba8fc98d00
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-02-18 14:36:04 -08:00
d9229ad643
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-02-18 14:35:32 -08:00
a278e153c4
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-02-18 14:35:20 -08:00
9f4865e4ca
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-02-18 14:34:45 -08:00
f78c15d84f
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-02-18 14:34:03 -08:00
8090a9a908
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/zpool/zpool_main.c
2009-02-18 14:31:46 -08:00
7872d84be6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-02-18 14:30:54 -08:00
15f5ddebdf
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
...
Conflicts:
lib/libzpool/kernel.c
2009-02-18 14:29:08 -08:00
109a1d5b16
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-02-18 14:28:38 -08:00
6fe19bd252
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
...
Conflicts:
lib/libzpool/kernel.c
module/zfs/arc.c
2009-02-18 14:28:15 -08:00
f0a8aedfbc
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
...
Conflicts:
lib/libzpool/kernel.c
module/zfs/arc.c
2009-02-18 14:27:12 -08:00
3eb7fa9afd
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-02-18 14:04:08 -08:00
5be9e325a1
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:03:22 -08:00
ba528721da
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-02-18 13:12:58 -08:00
0b8e48b813
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-02-18 13:12:53 -08:00
e203e7b48f
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-02-18 13:12:35 -08:00
f686a87058
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/arc.c
2009-02-18 13:12:26 -08:00
3b17164f71
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
module/zfs/vdev.c
module/zfs/zio.c
2009-02-18 13:09:32 -08:00
d164b20935
Rebase master to b108
2009-02-18 12:51:31 -08:00
27e7565a93
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-02-03 09:46:46 -08:00
3d86fad730
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-02-03 09:46:36 -08:00
9cd029b543
Remove mknod from library.
...
This is all nowhandled in the SPL. When HAVE_GPL_ONLY_SYMBOLS is defined
because the module license is set to GPL we can leverage the udev interfaces
which will create the device. When HAVE_GPL_ONLY_SYMBOLS is not defined
we resort to an ugly hack and the SPL invokes a usermode helper to create
to missing device file for us in /dev/. Using GPL version modules is off
course preperable when possible.
2009-02-03 09:38:53 -08:00
ca804c66f8
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-01-16 14:55:26 -08:00
7c5b7d2a94
This should always be success when zvol support is disabled
2009-01-16 14:52:35 -08:00
adcb983918
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-15 14:22:14 -08:00
389b037e7a
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-01-15 14:22:01 -08:00
df7ad715a9
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-01-15 14:21:49 -08:00
d58ed0e6c7
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-01-15 14:21:36 -08:00
594ce22168
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-01-15 14:21:30 -08:00
476261f2d5
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-15 14:21:18 -08:00
2c83372734
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-15 14:21:11 -08:00
091a4a4ca4
Resolve conflict with removed cleaner type
2009-01-15 14:20:49 -08:00
cb8e50168e
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-15 14:19:06 -08:00
1f372d9030
Resolve conflict with removed cleaner type
2009-01-15 14:18:01 -08:00
ddaad20220
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:16:23 -08:00
a42707fcc0
Resolve conflict with removed cleaner type
2009-01-15 14:16:03 -08:00
48a55a0a10
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-01-15 14:13:54 -08:00
551838a6c8
Resolve conflict with removed cleaner type
2009-01-15 14:13:39 -08:00
da7151a89e
Resolve conflict with removed cleaner type
2009-01-15 14:11:19 -08:00
7b54fe44dc
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-01-15 14:05:38 -08:00
977fef2ba7
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-01-15 14:05:32 -08:00
2f36bf5af4
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-01-15 14:05:29 -08:00
35a269c06c
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-01-15 14:05:26 -08:00
a2e601c6e3
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-01-15 14:04:39 -08:00
3fa768e21b
Resolve conflict with removed cleaner type
2009-01-15 14:04:35 -08:00
d3df6b2012
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-01-15 14:01:51 -08:00
fb5f0bc833
Rebase master to b105
2009-01-15 13:59:39 -08:00
aff2252263
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-14 14:27:42 -08:00
fd93449de9
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-01-14 14:27:31 -08:00
4fdb04d0a1
A little hackery to handle using zdb when the module stack isn't loaded. This is a hack and should be addressed upstream, zdb should not be attempting to initialize services it doesn't need
2009-01-14 14:25:25 -08:00
e6746c2609
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-01-14 12:06:41 -08:00
3764ec0e1e
Fixed sizeof() issue and minor cleanup
2009-01-14 12:03:03 -08:00
97073208f8
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-01-14 10:42:45 -08:00
bdde0d9d40
Return success here not failure
2009-01-14 10:37:35 -08:00
7f9ce14e58
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-13 09:55:40 -08:00
09b6f64e2d
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-01-13 09:55:30 -08:00
ef6d827a88
Don't check HAVE_SPL unavailable in userspace build
2009-01-13 09:53:35 -08:00
a62a385848
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-09 16:54:15 -08:00
13ab1d30be
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-01-09 16:53:53 -08:00
e22bfeab4e
Update load/unload message, mknod /dev/zfs when udev is unavailable
2009-01-09 16:50:08 -08:00
402405558a
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-09 15:11:56 -08:00
b8fc1110d1
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-01-09 15:11:48 -08:00
fce16fe818
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-01-09 15:11:38 -08:00
d2d018fafa
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-01-09 15:11:29 -08:00
1fd9167bc0
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-01-09 15:11:25 -08:00
e86fa83ee6
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-09 15:11:16 -08:00
89cf8c8a67
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-09 15:11:11 -08:00
aa6c4ff685
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-09 15:10:59 -08:00
921ebaf7f7
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-09 15:10:43 -08:00
522fb18428
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-09 15:10:26 -08:00
6791a1ee34
I don't think we need this in userspace
2009-01-09 15:07:32 -08:00
a7e5f34acb
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-09 14:46:41 -08:00
7af644b8b3
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-01-09 14:46:32 -08:00
ca0b39e0e7
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-01-09 14:46:23 -08:00
fd07f08222
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-01-09 14:46:14 -08:00
0f48a52f65
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-01-09 14:46:10 -08:00
d584ad239d
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-09 14:46:01 -08:00
4022f85bac
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-09 14:45:56 -08:00
be3a17e437
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-09 14:45:45 -08:00
8e1f5d7bec
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-09 14:45:29 -08:00
d315fcf28e
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-09 14:45:13 -08:00
ff09d64647
Pull all source in to be built, it will be ifdef'ed out as need by higher level topic branches
2009-01-09 14:37:45 -08:00
8a6f0ab272
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-08 10:29:23 -08:00
eba9726539
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-01-08 10:29:13 -08:00
b7256edf16
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-01-08 10:29:02 -08:00
dd069ed4fe
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-01-08 10:28:52 -08:00
9d335bca85
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-01-08 10:28:47 -08:00
e1a4af24af
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-08 10:28:37 -08:00
a43e0b50fb
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-08 10:28:32 -08:00
06749d1581
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-08 10:28:18 -08:00
c281c15c84
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-08 10:28:00 -08:00
b7d9adb500
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-08 10:27:42 -08:00
b457fb49f9
Remove vdev_disk from userspace build, vdev_file is used
2009-01-08 10:23:59 -08:00
77c4ef21ab
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-05 13:47:29 -08:00
889bb92210
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-01-05 13:47:21 -08:00
eea4cc8e0e
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-01-05 13:47:12 -08:00
73e48eae6d
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-01-05 13:47:03 -08:00
97dab5053e
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-01-05 13:46:59 -08:00
dbcb8f3921
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-05 13:46:51 -08:00
a9bfb78b5a
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-05 13:46:47 -08:00
3bc01c0326
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-05 13:46:35 -08:00
f88ab3c355
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-05 13:46:21 -08:00
80ed6c342d
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-05 13:46:06 -08:00
c15fa0ceb0
Add include paths
2009-01-05 13:44:26 -08:00
35cfc1bb85
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-05 12:45:38 -08:00
0f742dfc96
Refresh context
2009-01-05 12:45:17 -08:00
681ba5c296
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-01-05 12:41:42 -08:00
727a4622dc
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-01-05 12:41:24 -08:00
9c73332e81
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-01-05 12:41:15 -08:00
d5350109f4
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-05 12:40:55 -08:00
6ce317a8d5
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-05 12:40:48 -08:00
9c2bf69ecb
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-05 12:40:25 -08:00
c8fa7c9b23
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-05 12:39:56 -08:00
9a0cb95b1b
Resolve conflict
2009-01-05 12:38:23 -08:00
ce7115b807
Add unicode makefile references and support
2009-01-05 12:33:09 -08:00
ced77c2f1b
Add unicode makefile references and support
2009-01-05 12:32:55 -08:00
1b327abcfd
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-01-05 11:54:52 -08:00
3d2e086e21
Remove u8 support, moved to libu8
2009-01-05 11:52:51 -08:00
50735743b7
Err undo that
2008-12-22 16:22:28 -08:00
bb128e51e6
Use thread so we can add other goodies beyond simply the pthread base
2008-12-22 16:20:36 -08:00
53f2b61ce1
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-22 15:21:10 -08:00
89585b82fa
Add missing limits
2008-12-22 15:17:57 -08:00
3251158230
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-22 15:06:42 -08:00
091c16c185
Add missing tzfile.h
2008-12-22 15:04:47 -08:00
314e57ba29
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-22 14:59:06 -08:00
b0704f1597
Add missing header for ztest
2008-12-22 14:57:15 -08:00
97e7199aaf
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2008-12-22 14:45:43 -08:00
ef6c136edb
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-22 14:45:33 -08:00
fccd2786e1
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-22 14:45:23 -08:00
a9545c30e8
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-22 14:45:14 -08:00
86efe1f206
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-22 14:45:09 -08:00
12573fb5b9
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-22 14:44:59 -08:00
c267d86b09
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-22 14:44:55 -08:00
16d3bec487
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-22 14:44:42 -08:00
997a274a13
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 14:44:25 -08:00
ff8a2f61ff
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 14:44:07 -08:00
29b47d366e
Remove some headers
2008-12-22 14:42:02 -08:00
139792e6b2
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2008-12-22 13:53:03 -08:00
fa078fa9dd
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-22 13:52:53 -08:00
7edc6e24a8
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-22 13:52:42 -08:00
9bf58af1f5
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-22 13:52:31 -08:00
6157e981b3
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-22 13:52:26 -08:00
262e367cd5
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-22 13:52:16 -08:00
877699acb1
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-22 13:52:11 -08:00
1f72057409
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-22 13:51:57 -08:00
52bfcda357
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 13:51:39 -08:00
05fafc638f
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 13:51:21 -08:00
90e5216ea9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 13:51:17 -08:00
035e4d373e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-22 13:51:16 -08:00
c9597f9a4f
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2008-12-22 13:51:15 -08:00
6bed331e59
More compat changes
2008-12-22 13:47:58 -08:00
0789abcd67
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2008-12-22 12:55:06 -08:00
57e03b4986
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-22 12:54:57 -08:00
bc90a3635d
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-22 12:54:46 -08:00
56f6031652
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-22 12:54:37 -08:00
bdfff917f3
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-22 12:54:32 -08:00
a40064cfd1
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-22 12:54:21 -08:00
b7770e3b13
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-22 12:54:16 -08:00
34f30113a8
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-22 12:54:03 -08:00
195c61d105
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 12:53:46 -08:00
b93191445c
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 12:53:27 -08:00
121effcbee
Pull everything in to the Makefile
2008-12-22 12:51:03 -08:00
1e9c6b3020
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2008-12-22 12:24:47 -08:00
79491b69f4
Start linux-have-zpl layer
2008-12-22 12:23:27 -08:00
a6d6f31db6
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-22 12:09:08 -08:00
d7d260b870
Removing branch to readd under new name
2008-12-22 12:05:11 -08:00
d7fafdb56e
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-22 11:42:23 -08:00
300ff503d4
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-22 11:42:13 -08:00
d0cacda56c
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-22 11:42:04 -08:00
f752d29d6c
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-22 11:41:59 -08:00
7b4bf789e9
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-22 11:41:50 -08:00
6d13a998fb
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-22 11:41:45 -08:00
86392b70ad
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-22 11:41:40 -08:00
187be3051e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-22 11:41:27 -08:00
7f2da73568
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 11:41:11 -08:00
aece7f6822
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 11:40:54 -08:00
7047bb0678
Add missing files from Makefile.am
2008-12-22 11:36:48 -08:00
01dee27561
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-22 10:37:44 -08:00
4e564d755b
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-22 10:37:42 -08:00
7e800d8125
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-22 10:37:33 -08:00
7e1406dd6c
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-22 10:37:24 -08:00
edaabab594
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-22 10:37:19 -08:00
8ad9104988
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-22 10:37:10 -08:00
5169758856
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-22 10:37:05 -08:00
c6e93310af
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-22 10:37:00 -08:00
bdbd91fe46
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-22 10:36:48 -08:00
11147f632c
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 10:36:32 -08:00
9c47372b96
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 10:36:15 -08:00
5f0a629790
Add enable_extended_FILE_stdio #define
2008-12-22 10:34:22 -08:00
10911f9d71
Add missing sources
2008-12-22 10:27:41 -08:00
42344f04c1
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-22 10:15:20 -08:00
8fdc6ee079
Stub out two more funcs until zpl support exists
2008-12-22 10:13:31 -08:00
0ecac4865c
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-22 10:03:22 -08:00
e8b703cb46
Add sys/time.h
2008-12-22 10:00:01 -08:00
783faf9040
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-19 16:57:45 -08:00
6d9b733aab
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-19 16:57:43 -08:00
c2177925af
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-19 16:57:23 -08:00
b15673351e
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-19 16:57:06 -08:00
ea8c323c36
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-19 16:56:56 -08:00
1a2361c2d7
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-19 16:56:39 -08:00
1963e197a7
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-19 16:56:31 -08:00
e8676f2c5f
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 16:56:24 -08:00
2e8b703fff
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 16:56:03 -08:00
96e85b9e96
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-19 16:55:34 -08:00
4420db3d37
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-19 16:55:00 -08:00
60289ccd8f
Add zfs_byteswap
2008-12-19 16:51:14 -08:00
ae21fcad1c
Add missing acl files
2008-12-19 16:49:31 -08:00
252ef2053c
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-19 16:36:02 -08:00
06d461ee7b
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-19 16:35:43 -08:00
66be6018a5
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-19 16:35:27 -08:00
dad4dd0dd4
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-19 16:35:17 -08:00
8806156f06
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-19 16:34:57 -08:00
6fdfd55847
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-19 16:34:48 -08:00
3f0c49cfa4
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 16:34:38 -08:00
cbc70456f1
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 16:34:10 -08:00
0868f08291
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-19 16:33:37 -08:00
809ca413e5
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-19 16:33:03 -08:00
96813619bf
Pull in new background scrubber
2008-12-19 16:29:13 -08:00
6f718e396c
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-19 16:27:08 -08:00
50c5923533
Resolve lingering atomic asm build issues. I think
2008-12-19 16:23:26 -08:00
449c6c9e8b
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-19 16:11:13 -08:00
0581ade42b
Add target_cpu
2008-12-19 16:07:26 -08:00
1974fe42c2
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-19 16:03:07 -08:00
b66eafc892
Add assembler flags
2008-12-19 15:56:04 -08:00
23eb8e4234
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-19 15:13:32 -08:00
febd743891
First pass at getting userspace 64bit atomic ops working:
2008-12-19 15:11:43 -08:00
8dbb32f117
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-19 13:58:44 -08:00
545f76d526
Add P2BOUNDARY macro
2008-12-19 13:56:55 -08:00
d6013ca22b
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-19 13:38:47 -08:00
3579c5ac5a
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-19 13:38:38 -08:00
f5d11f37bd
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-19 13:38:29 -08:00
d04ad444b9
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-19 13:38:25 -08:00
fbc711944c
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-19 13:38:16 -08:00
f4ff14afdb
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-19 13:38:11 -08:00
0127d5e65b
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 13:38:07 -08:00
4679c1631c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 13:37:55 -08:00
102a98af37
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-19 13:37:40 -08:00
d1f5be0b8b
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-19 13:37:23 -08:00
8ab575cd8e
Remove vdev_disk.c from userspace build, we simply use vdev_file.c here
2008-12-19 13:35:29 -08:00
b95f799218
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-19 13:16:48 -08:00
28edfc91c8
Add compress header
2008-12-19 13:14:49 -08:00
338dd65c10
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-19 12:40:02 -08:00
b86297e4d3
Add missing umem bits
2008-12-19 12:32:08 -08:00
553ed5a642
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-19 12:22:08 -08:00
55c0063df6
Add 2 more headers where are missing
2008-12-19 12:18:59 -08:00
0b750e64a3
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-19 12:11:12 -08:00
87dc99c933
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-19 12:11:09 -08:00
ee2e34a7a5
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-19 12:10:50 -08:00
6216d4cd8a
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-19 12:10:34 -08:00
b660663ca7
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-19 12:10:24 -08:00
eb4c53562b
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-19 12:10:06 -08:00
fef6be057e
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-19 12:09:57 -08:00
bb5b627011
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 12:09:48 -08:00
8e9ab16b20
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 12:09:23 -08:00
78f7affc44
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-19 12:08:57 -08:00
3ce12f6815
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-19 12:08:24 -08:00
e485017676
Remove spa_boot from userspace build
2008-12-19 12:04:45 -08:00
f72a142146
Strip out sunddi support, this can be done in context
2008-12-19 12:04:07 -08:00
5f0e8b8d91
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-19 11:57:25 -08:00
273cbc844a
Fix trailing 'a' char
2008-12-19 11:55:38 -08:00
02bef1e61b
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-19 11:50:09 -08:00
f9a746f44f
Flesh out some more of the sunddi
2008-12-19 11:48:21 -08:00
b8e10bfc20
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-19 11:32:33 -08:00
615168d176
Stub out additional sunddi interfaces
2008-12-19 11:30:42 -08:00
1fb4f38e73
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-19 11:14:55 -08:00
ce80c4a422
Add utsname.h header
2008-12-19 11:13:07 -08:00
08ecd85f89
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-19 10:19:53 -08:00
726f45d53d
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-19 10:19:42 -08:00
bc5f8da7f6
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-19 10:19:32 -08:00
9b02e8cb72
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-19 10:19:27 -08:00
7ef56c4e1c
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-19 10:19:17 -08:00
1a238799ba
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-19 10:19:12 -08:00
42e7e0b017
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 10:19:07 -08:00
a577858f33
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 10:18:53 -08:00
41016312ae
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-19 10:18:36 -08:00
143bd1614e
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-19 10:18:16 -08:00
9de4108779
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 10:18:12 -08:00
3e2e5c4535
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-19 10:18:12 -08:00
a68af79057
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2008-12-19 10:18:11 -08:00
d4c39af7a6
Re-add KM_PUSHPAGE
2008-12-19 10:15:52 -08:00
330840ff2e
Re-add KM_PUSHPAGE
2008-12-19 10:15:27 -08:00
b6d881a293
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-19 10:11:30 -08:00
75b98b396b
Add missing VM types
2008-12-19 10:09:35 -08:00
67b265106b
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-19 10:03:31 -08:00
8578673221
Add DTRACE_PROBE(a) macro
2008-12-19 10:01:38 -08:00
fa6f423f31
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-19 09:54:43 -08:00
cd0966054f
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-19 09:54:32 -08:00
b164745a8d
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-19 09:54:21 -08:00
530b2e6564
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-19 09:54:15 -08:00
e17e93da32
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-19 09:54:04 -08:00
ec916d278e
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-19 09:53:57 -08:00
9a20c1615b
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 09:53:52 -08:00
1a0d43ceac
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 09:53:37 -08:00
10fd4b002f
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-19 09:53:17 -08:00
24e15d1bb1
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-19 09:52:57 -08:00
2d0ae2710c
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 09:52:53 -08:00
5906903384
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-19 09:52:52 -08:00
3d8832a795
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2008-12-19 09:52:51 -08:00
3bc48c3e74
Missing func readd
2008-12-19 09:50:15 -08:00
111303eeb8
context
2008-12-19 09:47:09 -08:00
dbc567603d
Readd removed hunk
2008-12-19 09:39:17 -08:00
56217b4c11
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-19 09:32:50 -08:00
cdcb2af79b
Add proper header
2008-12-19 09:30:56 -08:00
1e0f1b2c02
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-19 09:08:03 -08:00
a1e023d7a4
Add strtoxx functions
2008-12-19 09:05:50 -08:00
acfcb00a6e
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-18 13:20:04 -08:00
97a0b13aec
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-18 13:19:54 -08:00
0beb23495e
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-18 13:19:44 -08:00
dddf2efadf
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-18 13:19:38 -08:00
7299994fcf
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-18 13:19:28 -08:00
1eaa464a82
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-18 13:19:22 -08:00
155929dfcd
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 13:19:17 -08:00
e6169bf282
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 13:19:03 -08:00
e55e3643df
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-18 13:18:46 -08:00
da1ceb2bbe
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-18 13:18:27 -08:00
72bf32a79f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 13:18:19 -08:00
844a9ced6d
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-18 13:18:17 -08:00
33e499be43
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2008-12-18 13:18:15 -08:00
8e136cf0c9
Add noinline macro for userspace
2008-12-18 13:15:58 -08:00
16dc43525b
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-18 10:03:15 -08:00
dc78b79ec8
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-18 10:03:05 -08:00
412a212afe
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-18 10:02:56 -08:00
7d3b45b517
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2008-12-18 10:02:51 -08:00
bf922798ae
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-18 10:02:41 -08:00
2956fc01be
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-18 10:02:36 -08:00
8fa18afc2e
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 10:02:32 -08:00
c5472b82d0
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 10:02:19 -08:00
ed5b55e3b2
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-18 10:02:02 -08:00
4d86e8fa92
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-18 10:01:44 -08:00
0a353443cd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 10:01:41 -08:00
9c0846462b
Resolve conflict
2008-12-18 10:01:37 -08:00
4df7b421a1
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2008-12-18 10:00:46 -08:00
25a3fca866
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 10:00:45 -08:00
9e195d0cbf
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-18 10:00:44 -08:00
c8f253cda8
Now fixed in fix-pthreads branch
2008-12-18 09:58:42 -08:00
229aba2943
Properly cast thread functions for pthreads
2008-12-18 09:56:22 -08:00
893ed2fad0
Properly cast thread functions for pthreads
2008-12-18 09:56:05 -08:00
d511dad31e
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-18 09:40:07 -08:00
5915f86ab1
Add callb.h header
2008-12-18 09:38:10 -08:00
fe5b927a4a
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2008-12-18 09:36:22 -08:00
0a6ac25d10
Add vmem_ interface mapping for user space
2008-12-18 09:34:27 -08:00
c90836a39f
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-17 16:47:17 -08:00
86bc861773
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-17 16:46:59 -08:00
853f23dfa8
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-17 16:46:43 -08:00
58e5869872
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-17 16:46:10 -08:00
56d78748f6
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-17 16:45:57 -08:00
7053ff3e65
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-17 16:45:45 -08:00
eb8725f0f8
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-17 16:45:15 -08:00
95158f8107
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-17 16:44:35 -08:00
c27a2516c2
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-17 16:43:55 -08:00
f799177730
Add all sources for libzfs userspace funcationality
2008-12-17 16:39:45 -08:00
8b33b8f8cd
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-17 16:08:05 -08:00
0f7520c7b0
Add gethrtime
2008-12-17 16:04:10 -08:00
b07886e188
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-17 16:00:29 -08:00
9ab4c93028
Wrap more stuff in HAVE_ZPL
2008-12-17 15:58:20 -08:00
9877a35f9f
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-17 15:35:41 -08:00
06005641bb
Stub out mount/share related func
2008-12-17 15:33:45 -08:00
99a4e4a121
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-17 14:36:43 -08:00
e3150dafb7
Add getexecname to Makefile.am
2008-12-17 14:34:48 -08:00
6a0d0cbd0f
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-17 14:16:20 -08:00
370f0a1773
Add zone and getmntany sources
2008-12-17 14:14:23 -08:00
c1e34481d8
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-17 13:38:38 -08:00
0590c2a818
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-17 13:38:28 -08:00
cd76848d7c
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-17 13:38:19 -08:00
6a6463a6a6
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-17 13:38:05 -08:00
4a07f548c1
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-17 13:38:01 -08:00
17ce6fed40
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-17 13:37:56 -08:00
cacdbdba2f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-17 13:37:44 -08:00
7139f15b92
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-17 13:37:27 -08:00
3be083292c
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-17 13:37:10 -08:00
ba3d5afa54
Add missing \
2008-12-17 13:35:06 -08:00
33b73cd800
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-17 11:37:48 -08:00
e91e5900c3
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-17 11:37:38 -08:00
0e1addbcc1
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-17 11:37:29 -08:00
bda39e3f52
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-17 11:37:16 -08:00
8d0ab2e4a0
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-17 11:37:11 -08:00
bdd147eb8b
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-17 11:37:07 -08:00
3cf4e51b1c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-17 11:36:55 -08:00
858f1f329a
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-17 11:36:39 -08:00
e0f0e02636
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-17 11:36:22 -08:00
5ea99efac7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 11:36:20 -08:00
676ab35598
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-17 11:36:19 -08:00
0106dabb11
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2008-12-17 11:36:18 -08:00
a681d70e28
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 11:36:17 -08:00
e532f6bef4
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 11:36:16 -08:00
8af904a4b0
Resolve index shadowing /usr/include/string.h:304
2008-12-17 11:34:19 -08:00
ed9a35324d
Not sure why Sun needed to remove these externs, but I need them back
2008-12-17 11:32:47 -08:00
d8a55bcb89
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-17 11:28:46 -08:00
100e5ebb03
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-17 11:28:37 -08:00
84cf167e93
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-17 11:28:29 -08:00
199eaf1874
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-17 11:28:16 -08:00
2ad946619e
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-17 11:28:11 -08:00
44f4c483bc
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-17 11:28:07 -08:00
5cbfff3589
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-17 11:27:55 -08:00
a4b3bb43a9
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-17 11:27:40 -08:00
01e5ef8ebe
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-17 11:27:23 -08:00
25db7e9413
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 11:27:21 -08:00
935fd6c681
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 11:27:20 -08:00
55c8582174
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 11:27:19 -08:00
dcf0fb9ffb
Resolve shadow conflicts
2008-12-17 11:25:21 -08:00
e5191c5ed5
Resolve conflict
2008-12-17 11:19:19 -08:00
a2b11e4955
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-17 11:18:33 -08:00
64d5108c1f
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-17 11:18:24 -08:00
35257bfbd6
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-17 11:18:11 -08:00
47d0dbf5f6
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-17 11:18:07 -08:00
27448c8cdb
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-17 11:18:02 -08:00
6f2638f7a3
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-17 11:17:50 -08:00
8fd272bb0f
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-17 11:17:34 -08:00
746c17afcf
Resolve conflict
2008-12-17 11:16:41 -08:00
7973e77bfc
Re-add zpool (part of it), we need to build it for the common bits
2008-12-17 11:12:06 -08:00
1ef609d29e
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-17 10:45:00 -08:00
4291b2e02f
Add locale.h
2008-12-17 10:43:06 -08:00
5ce03568c6
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-17 10:12:32 -08:00
e23605530a
Update #ifndef/#defines
2008-12-17 10:10:32 -08:00
6d524f2906
Cleanup some of the #ifndef/#defines
2008-12-17 10:06:55 -08:00
07394c4b64
Add mkdev.h rename _SOL_SYS to _LIBSPL_SYS
2008-12-17 10:04:04 -08:00
204ec2e8f4
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2008-12-17 09:50:56 -08:00
0b7ef284bd
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-17 09:50:55 -08:00
bcbf74fead
Remove assert/verify support from zfs_context, moved to assert.h
2008-12-17 09:49:02 -08:00
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
5c9d50894c
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-16 16:39:02 -08:00
8ad2f7697a
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-16 16:38:48 -08:00
c76494c348
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-16 16:38:17 -08:00
6078c0a99e
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-16 16:37:47 -08:00
daa6dfed96
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-16 16:37:05 -08:00
4ece62233d
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-16 16:36:52 -08:00
8f160abede
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-16 16:36:39 -08:00
8ffad5b6c0
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-16 16:35:57 -08:00
158d07270f
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-16 16:35:09 -08:00
715ac6ca88
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-16 16:34:16 -08:00
7453ec0f2c
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 16:34:09 -08:00
8bed8da925
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 16:34:07 -08:00
2d7f255945
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-16 16:34:04 -08:00
ebab24f633
Resolve shadow conflict
2008-12-16 16:26:50 -08:00
2d271e7a94
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-16 16:22:42 -08:00
3d34904fbb
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-16 16:22:34 -08:00
750332e323
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-16 16:22:15 -08:00
f4b3b4ea9c
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-16 16:21:58 -08:00
015fcbe3b2
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-16 16:21:32 -08:00
5477876bdb
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-16 16:21:25 -08:00
a56dee01f5
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-16 16:21:17 -08:00
94dd45c46d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-16 16:20:54 -08:00
b5550a0079
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-16 16:20:25 -08:00
6a902fe21c
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-16 16:19:56 -08:00
f2bc2f7b6f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 16:19:52 -08:00
fd4da48000
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 16:19:50 -08:00
29be0d44ba
Resolve conflict
2008-12-16 16:19:46 -08:00
4d21a1c977
Resolve two more shadow conflicts
2008-12-16 16:14:19 -08:00
4ee4891d66
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-16 16:10:16 -08:00
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
f50ed8e8c6
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-16 15:52:50 -08:00
1f5373d772
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-16 15:52:46 -08:00
cf408f0187
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-16 15:52:37 -08:00
4a0630d83e
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-16 15:52:28 -08:00
70c7936ebf
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-16 15:52:15 -08:00
bad9c6965c
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-16 15:52:11 -08:00
afc91005b1
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-16 15:52:06 -08:00
cc53801767
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-16 15:51:54 -08:00
a77d20e66b
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-16 15:51:39 -08:00
e5000a1073
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-16 15:51:22 -08:00
12c13fbafb
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 15:51:20 -08:00
4583b6d5ba
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 15:51:19 -08:00
e14e140b52
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-16 15:51:19 -08:00
3c515284a6
Remove double declaration of char *
2008-12-16 15:49:21 -08:00
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
7e43e16395
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2008-12-16 15:34:50 -08:00
35f607040f
Wrap additional new efi code in HAVE_LIBEFI macros
2008-12-16 15:33:00 -08:00
6e002c41b8
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-16 15:22:48 -08:00
a3ea268b72
Add 2 missing headers
2008-12-16 15:20:56 -08:00
ca161b928b
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-16 15:17:54 -08:00
36722eee12
Comment out most of the file until ZPL support arrives
2008-12-16 15:16:04 -08:00
6d01a82ce5
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-16 14:45:32 -08:00
ef919ac403
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-16 14:45:31 -08:00
66587f0fee
Remove all the share stuff
2008-12-16 14:43:38 -08:00
66cf9db3d0
Remove non-existing systeminfo ref
2008-12-16 14:38:52 -08:00
646230294f
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-16 14:35:24 -08:00
1f0ad04f2d
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-16 14:35:21 -08:00
dbd5e397c5
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-16 14:35:20 -08:00
56692ac3aa
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-16 14:35:12 -08:00
c75e9b1c12
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-16 14:35:03 -08:00
e213f59844
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-16 14:34:51 -08:00
b17ad01f98
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-16 14:34:47 -08:00
5840198e26
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-16 14:34:43 -08:00
a4c93e56cc
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-16 14:34:31 -08:00
bb20fd94fc
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-16 14:34:17 -08:00
047a942f42
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-16 14:34:01 -08:00
79bc1b23ed
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 14:33:59 -08:00
804830a231
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 14:33:59 -08:00
a8a0f9ea2a
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-16 14:33:58 -08:00
9439fbdcd3
Add systeminfo
2008-12-16 14:32:03 -08:00
53c0cdbc42
Resolve dirname shadow conflict with /usr/include/libgen.h:27 dirname
2008-12-16 14:29:35 -08:00
2c2372389a
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-16 14:24:23 -08:00
7df95c2f31
Add missing header
2008-12-16 14:22:31 -08:00
e583bf8b9e
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-16 14:19:55 -08:00
f6207ec73a
Add missing headers
2008-12-16 14:17:29 -08:00
52a453edaa
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-16 14:12:48 -08:00
9df591c9d3
Add sys/mount.h header
2008-12-16 14:10:43 -08:00
554defd465
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-16 14:07:00 -08:00
12cb53ce52
Make SHARENFS condition with ZPL
2008-12-16 14:05:09 -08:00
a07043191d
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-16 13:31:46 -08:00
ac3a2f3476
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-16 13:31:42 -08:00
9af5c86c0c
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-16 13:31:33 -08:00
7bd9ab13e9
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-16 13:31:25 -08:00
33072dc1bc
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-16 13:31:13 -08:00
48b059e690
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-16 13:31:08 -08:00
2f68235cc8
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-16 13:31:04 -08:00
751ee4041e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-16 13:30:53 -08:00
8342056a8a
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-16 13:30:38 -08:00
1d4b1187d7
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-16 13:30:23 -08:00
527e38c72b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 13:30:21 -08:00
34b937c016
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 13:30:21 -08:00
f693a600d0
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-16 13:30:20 -08:00
206a3ac58c
Resolve 2 more shadow conflicts
2008-12-16 13:28:23 -08:00
e8a56ea793
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2008-12-16 13:22:48 -08:00
e329093faf
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-16 13:22:44 -08:00
58645ef46d
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-16 13:22:36 -08:00
cbb564f839
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-16 13:22:27 -08:00
c78fdcb14a
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-16 13:22:15 -08:00
2bfe519e8b
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-16 13:22:11 -08:00
4a52a4dfb1
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-16 13:22:07 -08:00
d54cedd16c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-16 13:21:55 -08:00
1d4d3c5fa8
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-16 13:21:41 -08:00
b22a5e18fe
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-16 13:21:25 -08:00
60ad9afc28
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 13:21:23 -08:00
5af8235e41
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 13:21:23 -08:00
f82621d7cb
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-16 13:19:26 -08:00
5383875500
Create gcc-shadow branch
2008-12-16 13:19:01 -08:00
01918870b4
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2008-12-16 10:16:00 -08:00
e7d7f1803f
Remove unused hunk
2008-12-16 10:14:08 -08:00
3112028a39
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2008-12-16 10:13:43 -08:00
b62b556896
Moving unused hunk to unused patch
2008-12-16 10:11:41 -08:00
c26de31159
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-16 09:57:17 -08:00
e518437bbe
Add 3 missing headers
2008-12-16 09:54:42 -08:00
94d80663d7
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2008-12-16 09:43:38 -08:00
236abf7d17
Remove assfail() chunk, it just complicates things and is never used
2008-12-16 09:42:41 -08:00
4b3b2a56d2
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-16 09:40:35 -08:00
4d6a2499f6
Minor update to assert, pull include_next out of ifdef
2008-12-16 09:35:40 -08:00
d5a8919126
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-16 09:10:58 -08:00
b0b1c43c46
Add += for DEFAULT_INCLUDES
2008-12-16 09:08:43 -08:00
eb2a7c5200
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-16 09:06:37 -08:00
bf01b1ccdf
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-16 09:06:12 -08:00
4f488ec6e4
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-16 09:06:01 -08:00
a05ba90835
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-16 09:05:47 -08:00
151ee60cbf
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-16 09:05:02 -08:00
e07281deb9
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-16 09:04:47 -08:00
9fabbb14ad
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-16 09:04:35 -08:00
ef55a13da8
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-16 09:04:03 -08:00
589a6c72d6
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-16 09:03:27 -08:00
3ba34afff8
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-16 09:02:49 -08:00
a7b063d224
Add DEFAULT_INCLUDE to rules, adjust = to += accordingly
2008-12-16 08:58:41 -08:00
c0abfccb28
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-16 08:48:49 -08:00
b74b9388b9
Add zfs_config include
2008-12-16 08:44:37 -08:00
617be506e6
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-15 10:02:33 -08:00
5a17b1401d
Add unistd.h include config magic
2008-12-15 10:00:43 -08:00
4846f3140a
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-15 09:36:39 -08:00
5fd645e47a
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2008-12-15 09:36:37 -08:00
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
228b31e100
Add va_list include
2008-12-15 09:27:38 -08:00
9e00f970ec
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-15 09:12:46 -08:00
e1357f07c0
Add libshare.h stub
2008-12-15 09:10:33 -08:00
b35bef8df2
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-12 16:29:31 -08:00
dc73ec2513
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-12 16:29:11 -08:00
4380717fea
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-12 16:28:54 -08:00
5e125dc8b1
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-12 16:28:28 -08:00
bc2a0d3aac
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-12 16:28:18 -08:00
dbd7482662
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-12 16:28:07 -08:00
23302f57aa
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-12 16:27:40 -08:00
f73fee417e
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-12 16:27:04 -08:00
416157170a
Resolve conflict
2008-12-12 16:25:01 -08:00
0e8ac26fc9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-12 16:23:07 -08:00
08a8860091
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-12 16:23:04 -08:00
eee73dd80e
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2008-12-12 16:22:59 -08:00
d0c573f27e
Add in the reset of the pthread changes
2008-12-12 16:16:06 -08:00
c264712b93
Merge branch 'linux-context' into refs/top-bases/linux-zfs-branch
2008-12-12 16:09:33 -08:00
d07c7914a0
Refresh context for assert
2008-12-12 16:02:48 -08:00
6c859b40d7
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-12 15:58:07 -08:00
0c575736b6
Make this primatives conditional to not conflict with context
2008-12-12 15:56:06 -08:00
b978916b98
Merge branch 'linux-context' into refs/top-bases/linux-zfs-branch
2008-12-12 15:36:18 -08:00
ac35c9f782
Minor verify tweak
2008-12-12 15:35:12 -08:00
7b363155b3
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2008-12-12 15:28:31 -08:00
5b4fa8eb54
Revert libzfs hunk
2008-12-12 15:26:39 -08:00
a7b2b73c73
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-12 15:08:54 -08:00
6263035e10
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-12 15:08:32 -08:00
be0091aa60
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-12 15:07:50 -08:00
faf6c753bd
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-12 15:07:33 -08:00
f6421585ad
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-12 15:07:29 -08:00
a74ec0ff24
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-12 15:07:24 -08:00
54cb07032d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-12 15:07:12 -08:00
2e7dffd82a
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-12 15:07:06 -08:00
8917e616ba
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-12 15:06:57 -08:00
3ce8541e83
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-12 15:06:41 -08:00
d145044d80
Refresh Makefile
2008-12-12 15:04:48 -08:00
33ba2c56d1
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-12 14:57:48 -08:00
d7556c1578
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-12 14:57:47 -08:00
57dac8ad35
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-12 14:57:37 -08:00
df86df7535
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-12 14:57:27 -08:00
9787903adb
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-12 14:57:13 -08:00
06a700c073
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-12 14:57:08 -08:00
1e0ff074a9
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-12 14:57:03 -08:00
f5a62035c7
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-12 14:56:50 -08:00
dc19f8860e
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-12 14:56:43 -08:00
d17d4bccd4
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-12 14:56:35 -08:00
d3ed0c4920
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-12 14:56:18 -08:00
f154348ca9
Update Makefile
2008-12-12 14:52:43 -08:00
8c4ed354ff
Add missing header
2008-12-12 14:51:46 -08:00
67d05ea374
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-12 14:45:01 -08:00
1cdc368818
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-12 14:45:00 -08:00
9b1a5db258
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-12 14:44:51 -08:00
a12b0d1071
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-12 14:44:43 -08:00
a955848091
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-12 14:44:30 -08:00
d36ee76b0c
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-12 14:44:25 -08:00
52044a9601
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-12 14:44:21 -08:00
96cb73d58b
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-12 14:44:09 -08:00
2085d7ed6e
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-12 14:44:02 -08:00
d2fb78a491
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-12 14:43:53 -08:00
17d90b5122
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-12 14:43:37 -08:00
f981fad7c1
Add 5 missing headers
2008-12-12 14:41:45 -08:00
cf89e6e4b3
Refresh Makefile
2008-12-12 14:37:13 -08:00
0dcb08e7fd
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-12 14:30:19 -08:00
b1af545c03
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-12 14:30:10 -08:00
6a28abb1d8
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-12 14:30:01 -08:00
eb18d4f4b2
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-12 14:29:48 -08:00
59af9d5f3d
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-12 14:29:44 -08:00
a7450f7d3e
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-12 14:29:40 -08:00
bb4f48461e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-12 14:29:28 -08:00
1cac8533a1
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-12 14:29:21 -08:00
73b709fa62
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-12 14:29:12 -08:00
00fa98c5cf
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-12 14:28:56 -08:00
50532fe67b
Refresh Makefile
2008-12-12 14:27:04 -08:00
2051c5740b
Refresh Makefile
2008-12-12 14:26:14 -08:00
e0db7f116d
Resolve conflict
2008-12-12 14:22:23 -08:00
712ecbdc1c
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-12 14:21:47 -08:00
a404fc40d4
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-12 14:21:38 -08:00
0adbfd4cfb
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-12 14:21:24 -08:00
bc55a1e29b
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-12 14:21:19 -08:00
9d3a835a0f
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-12 14:21:14 -08:00
2db44f84d7
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-12 14:21:02 -08:00
948a4e0e2c
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-12 14:20:55 -08:00
ea758a9eea
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-12 14:20:46 -08:00
1bbe898289
Resolve conflict
2008-12-12 14:19:55 -08:00
5a27f3f0a5
Comment out libzpool builds for now
2008-12-12 14:16:50 -08:00
1c38136eed
Resolve conflict
2008-12-12 14:08:10 -08:00
8429981d4d
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-12 14:02:24 -08:00
4ad6161f1c
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2008-12-12 14:02:15 -08:00
Brian Behlendorf