Brian Behlendorf
|
77e4a2039c
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-07-07 16:10:51 -07:00 |
|
Brian Behlendorf
|
c460e5edb0
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-07-07 16:09:15 -07:00 |
|
Brian Behlendorf
|
04a83f2337
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-07-07 16:09:13 -07:00 |
|
Brian Behlendorf
|
19f57f1ae4
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-07-07 16:09:12 -07:00 |
|
Brian Behlendorf
|
55b864f19b
|
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
|
2009-07-07 16:09:12 -07:00 |
|
Brian Behlendorf
|
f80f59f955
|
Add missing paranthesis for gcc.
|
2009-07-07 16:01:13 -07:00 |
|
Brian Behlendorf
|
91316b77b9
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-07-07 15:51:57 -07:00 |
|
Brian Behlendorf
|
e5c8fcd6b0
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-07-07 15:50:14 -07:00 |
|
Brian Behlendorf
|
c75167c985
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-07-07 15:50:13 -07:00 |
|
Brian Behlendorf
|
33e5b3832f
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-07-07 15:50:12 -07:00 |
|
Brian Behlendorf
|
07a6b68575
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2009-07-07 15:50:11 -07:00 |
|
Brian Behlendorf
|
7373ddf55f
|
hash_lock should always be initialized
|
2009-07-07 15:41:19 -07:00 |
|
Brian Behlendorf
|
315f906678
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-07-07 14:29:57 -07:00 |
|
Brian Behlendorf
|
3ad5361df2
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-07-07 14:28:14 -07:00 |
|
Brian Behlendorf
|
ba97ae2628
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-07-07 14:28:13 -07:00 |
|
Brian Behlendorf
|
a4f435b51a
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-07-07 14:19:36 -07:00 |
|
Brian Behlendorf
|
ed3bd6f446
|
Merge branch 'fix-acl' into refs/top-bases/fix-branch
|
2009-07-07 14:19:35 -07:00 |
|
Brian Behlendorf
|
5bcfa12766
|
New TopGit dependency: fix-acl
|
2009-07-07 14:19:31 -07:00 |
|
Brian Behlendorf
|
798cf63309
|
New topic branch for minor acl related fixes
|
2009-07-07 14:18:47 -07:00 |
|
Brian Behlendorf
|
23f5686f20
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-07-07 14:09:10 -07:00 |
|
Brian Behlendorf
|
34422f0ffa
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-07-07 13:50:32 -07:00 |
|
Brian Behlendorf
|
47502cd94b
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-07-07 13:50:31 -07:00 |
|
Brian Behlendorf
|
1d8ef486a8
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-07-07 13:50:30 -07:00 |
|
Brian Behlendorf
|
fb26df15c8
|
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
|
2009-07-07 13:50:30 -07:00 |
|
Brian Behlendorf
|
cad9fa40e1
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2009-07-07 13:50:29 -07:00 |
|
Brian Behlendorf
|
a2423197e1
|
Resolve missing cast warning
|
2009-07-07 13:41:51 -07:00 |
|
Brian Behlendorf
|
361e0e7685
|
Fix newly introduced missing braces warnings for gcc.
|
2009-07-07 13:40:16 -07:00 |
|
Brian Behlendorf
|
ba95b1816a
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-07-06 15:40:13 -07:00 |
|
Brian Behlendorf
|
69b2257940
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-07-06 15:38:51 -07:00 |
|
Brian Behlendorf
|
8463b9e01e
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2009-07-06 15:38:50 -07:00 |
|
Brian Behlendorf
|
4272b9e492
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2009-07-06 15:38:49 -07:00 |
|
Brian Behlendorf
|
1f5a1d932e
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2009-07-06 15:38:48 -07:00 |
|
Brian Behlendorf
|
3a8e684d73
|
Additional lock calls were added to ztest and they must be updated
to use the pthread's API in favour of Solaris threads.
|
2009-07-06 15:31:54 -07:00 |
|
Brian Behlendorf
|
266a7d8cd7
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
Conflicts:
module/zcommon/zfs_namecheck.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zap_micro.c
|
2009-07-06 13:47:04 -07:00 |
|
Brian Behlendorf
|
658459249e
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-07-06 13:17:28 -07:00 |
|
Brian Behlendorf
|
926b04acba
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Conflicts:
cmd/ztest/ztest.c
|
2009-07-06 13:17:16 -07:00 |
|
Brian Behlendorf
|
8d4f19348a
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2009-07-06 13:16:34 -07:00 |
|
Brian Behlendorf
|
2838dba2c4
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2009-07-06 13:16:32 -07:00 |
|
Brian Behlendorf
|
cd098f87c8
|
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
Conflicts:
cmd/ztest/ztest.c
|
2009-07-06 13:16:29 -07:00 |
|
Brian Behlendorf
|
8795d8f034
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2009-07-06 13:15:43 -07:00 |
|
Brian Behlendorf
|
95ba24ed69
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Conflicts:
cmd/ztest/ztest.c
|
2009-07-06 13:15:35 -07:00 |
|
Brian Behlendorf
|
d369760713
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2009-07-06 13:14:41 -07:00 |
|
Brian Behlendorf
|
4e59805d98
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-07-06 13:14:36 -07:00 |
|
Brian Behlendorf
|
4ac493854e
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-07-06 13:14:20 -07:00 |
|
Brian Behlendorf
|
1851e0622f
|
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
|
2009-07-06 13:14:18 -07:00 |
|
Brian Behlendorf
|
f6c61972e1
|
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
|
2009-07-06 13:14:18 -07:00 |
|
Brian Behlendorf
|
ab14c47f14
|
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
|
2009-07-06 13:14:13 -07:00 |
|
Brian Behlendorf
|
4de6678930
|
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
|
2009-07-06 13:14:13 -07:00 |
|
Brian Behlendorf
|
5ab66031b7
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-07-06 13:14:08 -07:00 |
|
Brian Behlendorf
|
b21412b008
|
Merge commit 'refs/top-bases/fix-list' into fix-list
Conflicts:
module/zfs/zil.c
|
2009-07-06 13:14:05 -07:00 |