6521b99461
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-03-09 13:43:29 -08:00
f1c8b3a435
Fix duplicate uuid_t typedef.
...
This typedef is being done in both lib/libefi/include/sys/uuid.h and
/usr/include/uuid/uuid.h, both of which are included in lib/libefi/rdwr_efi.c.
This leads to the following error:
In file included from ../../lib/libefi/include/sys/efi_partition.h:29,
from ../../lib/libefi/rdwr_efi.c:41:
../../lib/libefi/include/sys/uuid.h:81: error: redefinition of typedef 'uuid_t'
/usr/include/uuid/uuid.h:19: note: previous declaration of 'uuid_t' was here
The reason that we didn't see this before, is because of a strange feature in
gcc where some types of warnings/errors are silently ignored if they come from
system headers. But depending on the order of how system headers end up
included, libefi's uuid.h may actually be included after uuid/uuid.h, which
leads to the error above.
It is safe to remove this duplicate typedef because we are already
dependent on the linux uuid.h header and it's exceptionally unlikely
they will ever change the size.
2010-03-09 13:38:55 -08:00
69a206fcee
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-03-09 13:26:10 -08:00
b39822ed60
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-03-09 13:26:08 -08:00
aef23651c3
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-03-09 13:26:04 -08:00
ee9da2efac
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-03-09 13:26:02 -08:00
e1f8751cb7
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-03-09 13:25:58 -08:00
6faf89731e
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-03-09 13:25:55 -08:00
044b499b43
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-03-09 13:25:51 -08:00
05b567c0ef
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-03-09 13:25:49 -08:00
bcf862f554
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-03-09 13:25:44 -08:00
4198550b18
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-09 13:25:42 -08:00
9053da0d04
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-03-09 13:25:38 -08:00
26b2ec2cd9
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-03-09 13:25:36 -08:00
5490798730
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-03-09 13:25:31 -08:00
13d740f8fa
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-03-09 13:25:29 -08:00
5b17af096c
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-03-09 13:25:24 -08:00
4ad660910b
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-03-09 13:25:22 -08:00
f3129fc3cd
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-03-09 13:25:18 -08:00
e5fd6fb97f
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-03-09 13:25:16 -08:00
a7e4cfc3be
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-03-09 13:25:11 -08:00
f134f893c1
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-09 13:25:09 -08:00
7c2efbfd28
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-03-09 13:25:04 -08:00
c0485b7731
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-09 13:25:02 -08:00
759c1e4f99
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-09 13:25:02 -08:00
99f1e547b1
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-03-09 13:24:53 -08:00
36fd3fc49c
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-03-09 13:24:52 -08:00
1ea8689197
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-03-09 13:24:47 -08:00
2948b21db2
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-03-09 13:24:45 -08:00
a3543de894
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2010-03-09 13:24:39 -08:00
89f4f4a695
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-03-09 13:24:37 -08:00
6c0502f5a6
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-03-09 13:24:32 -08:00
19eef8ad39
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-03-09 13:24:30 -08:00
dcb30ec329
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2010-03-09 13:24:30 -08:00
9fa502c50b
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-03-09 13:24:29 -08:00
e218fd13e8
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-03-09 13:24:28 -08:00
f2ab1fea36
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-03-09 13:24:27 -08:00
ef359aee66
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-03-09 13:24:27 -08:00
2b85024275
Use CPU percentages for number of commit cb threads.
...
This doesn't change number of threads in the kernel, but it reduces number of
threads in ztest (important due to 32-bit address limitations).
2010-03-09 13:21:20 -08:00
05d1b12449
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-03-09 12:31:54 -08:00
469d330632
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-03-09 12:31:52 -08:00
9702889ff5
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-03-09 12:31:47 -08:00
41844740dc
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-03-09 12:31:46 -08:00
5f1fd09e78
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-03-09 12:31:41 -08:00
ceba75045d
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-03-09 12:31:39 -08:00
33007de25e
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-03-09 12:31:34 -08:00
fdab6de381
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-03-09 12:31:32 -08:00
d6ecdf97d0
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-03-09 12:31:26 -08:00
3ea63f0cdb
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-09 12:31:25 -08:00
b2281d842e
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-03-09 12:31:20 -08:00
Brian Behlendorf
Ricardo M. Correia