Brian Behlendorf
|
815b41e8d1
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-08 11:29:30 -08:00 |
|
Brian Behlendorf
|
f60a240fea
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-08 11:29:29 -08:00 |
|
Brian Behlendorf
|
9c1750e54b
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-08 11:28:17 -08:00 |
|
Brian Behlendorf
|
5d31b4febd
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-08 11:28:15 -08:00 |
|
Brian Behlendorf
|
e60cd17a6a
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-08 11:28:14 -08:00 |
|
Brian Behlendorf
|
94b08b3b91
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-08 11:28:13 -08:00 |
|
Brian Behlendorf
|
c77cf87aff
|
Add kmem_* mapping for userspace
|
2008-12-08 11:26:28 -08:00 |
|
Brian Behlendorf
|
7c6de8b41c
|
Add missing cast
|
2008-12-08 10:32:55 -08:00 |
|
Brian Behlendorf
|
e35086615d
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:28:45 -08:00 |
|
Brian Behlendorf
|
c8eb06eaf1
|
Move strings.h from include/sys up a level to include
|
2008-12-08 10:27:04 -08:00 |
|
Brian Behlendorf
|
b73a1f59ab
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-08 10:21:13 -08:00 |
|
Brian Behlendorf
|
4a689eed9b
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:20:03 -08:00 |
|
Brian Behlendorf
|
85f71237d9
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-08 10:20:01 -08:00 |
|
Brian Behlendorf
|
35c322451f
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-08 10:20:00 -08:00 |
|
Brian Behlendorf
|
5cf55d35dd
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-08 10:20:00 -08:00 |
|
Brian Behlendorf
|
fd39fc67d0
|
Fix invalid %llf format by dropping useless ll prefix
|
2008-12-08 10:18:11 -08:00 |
|
Brian Behlendorf
|
992d1b1e17
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-08 10:13:12 -08:00 |
|
Brian Behlendorf
|
61e6f92381
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:12:00 -08:00 |
|
Brian Behlendorf
|
c6b3007cbe
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-08 10:11:59 -08:00 |
|
Brian Behlendorf
|
17c6f97565
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-08 10:11:58 -08:00 |
|
Brian Behlendorf
|
7fc98fdcdf
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2008-12-08 10:11:57 -08:00 |
|
Brian Behlendorf
|
4537766d57
|
Initialize unused sepp to NULL
|
2008-12-08 10:10:03 -08:00 |
|
Brian Behlendorf
|
987a54604c
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-05 17:08:04 -08:00 |
|
Brian Behlendorf
|
b0887ddcd7
|
Add linux-libspl branch
|
2008-12-05 16:59:15 -08:00 |
|
Brian Behlendorf
|
9b699e5a74
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:52:35 -08:00 |
|
Brian Behlendorf
|
9af0176ad7
|
Add zu.c file for build system
|
2008-12-05 14:50:51 -08:00 |
|
Brian Behlendorf
|
fd716b98cc
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:29:19 -08:00 |
|
Brian Behlendorf
|
f4b8f4cd57
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-05 14:29:18 -08:00 |
|
Brian Behlendorf
|
a221fd4a0f
|
Moving zu.c build system files to zfs-branch with the rest of the core build system
|
2008-12-05 14:28:05 -08:00 |
|
Brian Behlendorf
|
3ba5ab407c
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-05 14:22:26 -08:00 |
|
Brian Behlendorf
|
3198db7a18
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-05 14:22:25 -08:00 |
|
Brian Behlendorf
|
79689743c3
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:21:56 -08:00 |
|
Brian Behlendorf
|
18266508c7
|
Change libport+libsolcompat references to libspl
|
2008-12-05 14:20:33 -08:00 |
|
Brian Behlendorf
|
e26588e8bc
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-05 12:49:53 -08:00 |
|
Brian Behlendorf
|
6229b95b6e
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-05 12:48:39 -08:00 |
|
Brian Behlendorf
|
51e57e41da
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-05 12:47:37 -08:00 |
|
Brian Behlendorf
|
0b8ab32645
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-05 12:46:41 -08:00 |
|
Brian Behlendorf
|
28194af7e6
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-05 12:45:46 -08:00 |
|
Brian Behlendorf
|
d2032d798f
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-05 12:44:50 -08:00 |
|
Brian Behlendorf
|
c495db8223
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-05 12:43:57 -08:00 |
|
Brian Behlendorf
|
3a8d93c102
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-05 12:43:10 -08:00 |
|
Brian Behlendorf
|
3896613543
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-05 12:42:26 -08:00 |
|
Brian Behlendorf
|
fd79d4c796
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-05 12:41:42 -08:00 |
|
Brian Behlendorf
|
0408c2d6a1
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-05 12:40:58 -08:00 |
|
Brian Behlendorf
|
d6f7161332
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-05 12:40:22 -08:00 |
|
Brian Behlendorf
|
b4056061b2
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-05 12:39:50 -08:00 |
|
Brian Behlendorf
|
3f0871ac8a
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-05 12:39:20 -08:00 |
|
Brian Behlendorf
|
b33947124c
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-05 12:38:47 -08:00 |
|
Brian Behlendorf
|
3d398a481d
|
Refresh linux-have-xdr
|
2008-12-05 12:32:24 -08:00 |
|
Brian Behlendorf
|
61a9bb6151
|
Refresh linux-have-uio-rw
|
2008-12-05 12:23:10 -08:00 |
|
Brian Behlendorf
|
766bd8d0e9
|
Refresh linux-debug-zerocopy
|
2008-12-05 12:20:18 -08:00 |
|
Brian Behlendorf
|
cc13ead89c
|
Refresh linux-have-sysevent
|
2008-12-05 12:14:06 -08:00 |
|
Brian Behlendorf
|
fd606af35c
|
Refresh linux-kernel-module
|
2008-12-05 12:12:37 -08:00 |
|
Brian Behlendorf
|
9ed7c9b6ad
|
Refresh linux-zpios
|
2008-12-05 11:32:34 -08:00 |
|
Brian Behlendorf
|
fa94f86d0b
|
Refresh linux-user-disk
|
2008-12-05 11:25:15 -08:00 |
|
Brian Behlendorf
|
f712bb7cf5
|
Refresh linux-symbol-collisions
|
2008-12-05 11:23:54 -08:00 |
|
Brian Behlendorf
|
da020cdf3b
|
Refresh linux-legacy
|
2008-12-05 11:20:54 -08:00 |
|
Brian Behlendorf
|
1d0413a456
|
Refresh linux-kernel-mem
|
2008-12-05 11:18:10 -08:00 |
|
Brian Behlendorf
|
a5e3d71fd4
|
Refresh linux-kernel-disk
|
2008-12-05 11:16:18 -08:00 |
|
Brian Behlendorf
|
8dea9da02d
|
Refresh linux-ioctl
|
2008-12-05 11:11:50 -08:00 |
|
Brian Behlendorf
|
0fd95094fd
|
Refresh linux-have-zvol
|
2008-12-05 10:33:53 -08:00 |
|
Brian Behlendorf
|
9c1b2c3446
|
Refresh linux-have-mntent
|
2008-12-05 10:30:31 -08:00 |
|
Brian Behlendorf
|
4f8a53fb73
|
Refresh lib-have-spl-debug
|
2008-12-05 10:29:34 -08:00 |
|
Brian Behlendorf
|
56ed73d6e0
|
Refresh linux-have-libdiskmgt
|
2008-12-05 10:26:25 -08:00 |
|
Brian Behlendorf
|
e16c26f81a
|
Refresh linux-have-libefi
|
2008-12-05 10:25:07 -08:00 |
|
Brian Behlendorf
|
6e70d56d64
|
Refresh linux-have-fm
|
2008-12-05 10:22:13 -08:00 |
|
Brian Behlendorf
|
9baaa468ac
|
Refresh zfs-branch
|
2008-12-05 09:46:11 -08:00 |
|
Brian Behlendorf
|
b151bbbb44
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2008-12-05 09:36:28 -08:00 |
|
Brian Behlendorf
|
7a34cab76d
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-05 09:36:20 -08:00 |
|
Brian Behlendorf
|
74e79d3bf6
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2008-12-05 09:34:36 -08:00 |
|
Brian Behlendorf
|
779061eb3f
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2008-12-05 09:34:28 -08:00 |
|
Brian Behlendorf
|
f87b4ddad7
|
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
|
2008-12-05 09:34:21 -08:00 |
|
Brian Behlendorf
|
db27ad2a22
|
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
|
2008-12-05 09:34:15 -08:00 |
|
Brian Behlendorf
|
82e0ed26f9
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-05 09:34:09 -08:00 |
|
Brian Behlendorf
|
3dce9c0ff7
|
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
|
2008-12-05 09:34:03 -08:00 |
|
Brian Behlendorf
|
74fbfae8f4
|
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
|
2008-12-05 09:33:58 -08:00 |
|
Brian Behlendorf
|
7e27dd328e
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-05 09:33:51 -08:00 |
|
Brian Behlendorf
|
152004c1eb
|
Refresh gcc-unused branch
|
2008-12-05 09:21:43 -08:00 |
|
Brian Behlendorf
|
3f7a975c8e
|
Refresh gcc-uninit branch
|
2008-12-05 09:13:58 -08:00 |
|
Brian Behlendorf
|
f38455a2e1
|
Refresh gcc-no-parenthesis branch
|
2008-12-05 09:09:02 -08:00 |
|
Brian Behlendorf
|
1caa5db385
|
Refresh
|
2008-12-04 15:05:54 -08:00 |
|
Brian Behlendorf
|
647580c8f1
|
Refresh gcc-invalid-prototype branch
|
2008-12-04 15:00:44 -08:00 |
|
Brian Behlendorf
|
96dd9f20c3
|
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
|
2008-12-04 14:41:57 -08:00 |
|
Brian Behlendorf
|
d89462d075
|
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
|
2008-12-04 14:41:26 -08:00 |
|
Brian Behlendorf
|
8de21aeeef
|
Refresh gcc-cast branch
|
2008-12-04 14:41:11 -08:00 |
|
Brian Behlendorf
|
b2b57f4a8a
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-03 16:59:30 -08:00 |
|
Brian Behlendorf
|
84b88863cb
|
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
|
2008-12-03 16:56:53 -08:00 |
|
Brian Behlendorf
|
3934fa5796
|
Merge branch 'fix-stack' into refs/top-bases/fix-branch
|
2008-12-03 16:56:44 -08:00 |
|
Brian Behlendorf
|
8b02fed645
|
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
|
2008-12-03 16:56:35 -08:00 |
|
Brian Behlendorf
|
13c9056431
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-03 16:56:28 -08:00 |
|
Brian Behlendorf
|
509faf8d6e
|
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
|
2008-12-03 16:56:22 -08:00 |
|
Brian Behlendorf
|
094c415cc7
|
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
|
2008-12-03 16:56:21 -08:00 |
|
Brian Behlendorf
|
189f60fb23
|
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
|
2008-12-03 16:56:10 -08:00 |
|
Brian Behlendorf
|
1d26394d2d
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2008-12-03 16:56:10 -08:00 |
|
Brian Behlendorf
|
25b568c651
|
Merge branch 'fix-locks' into refs/top-bases/fix-branch
|
2008-12-03 16:56:01 -08:00 |
|
Brian Behlendorf
|
a01917a91d
|
Merge commit 'refs/top-bases/fix-locks' into fix-locks
|
2008-12-03 16:56:00 -08:00 |
|
Brian Behlendorf
|
8f14acd0ba
|
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
|
2008-12-03 16:55:50 -08:00 |
|
Brian Behlendorf
|
7ee15c26a4
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2008-12-03 16:55:49 -08:00 |
|
Brian Behlendorf
|
95bc12dae2
|
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
|
2008-12-03 16:55:41 -08:00 |
|
Brian Behlendorf
|
edd4013797
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2008-12-03 16:55:41 -08:00 |