Brian Behlendorf
f0f4a7a1c2
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2010-03-09 14:19:43 -08:00
Brian Behlendorf
ad72ea5360
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2010-03-09 14:19:43 -08:00
Brian Behlendorf
64f5e0e77b
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2010-03-09 14:19:42 -08:00
Brian Behlendorf
01db66d450
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2010-03-09 14:19:41 -08:00
Brian Behlendorf
d5b5666f2e
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2010-03-09 14:19:40 -08:00
Brian Behlendorf
f19f8e5dcc
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2010-03-09 14:19:40 -08:00
Brian Behlendorf
b1a86e0752
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2010-03-09 14:19:39 -08:00
Brian Behlendorf
5fc733bc97
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2010-03-09 14:19:39 -08:00
Brian Behlendorf
8515a07c0f
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2010-03-09 14:19:38 -08:00
Brian Behlendorf
881d65ec2b
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-03-09 14:19:37 -08:00
Brian Behlendorf
60a00a6316
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2010-03-09 14:19:36 -08:00
Brian Behlendorf
d0389e24d5
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-03-09 14:19:36 -08:00
Brian Behlendorf
651b0799e0
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-03-09 14:19:32 -08:00
Brian Behlendorf
f048a6798d
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-03-09 14:19:32 -08:00
Brian Behlendorf
61b3d268ac
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2010-03-09 14:19:31 -08:00
Brian Behlendorf
46481bc85e
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
2010-03-09 14:19:30 -08:00
Brian Behlendorf
94053b9a3d
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2010-03-09 14:19:29 -08:00
Brian Behlendorf
4b7bc4e96d
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2010-03-09 14:19:28 -08:00
Brian Behlendorf
ed83735903
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-03-09 14:19:26 -08:00
Brian Behlendorf
fd94e31370
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-03-09 14:19:26 -08:00
Brian Behlendorf
490f689b9c
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2010-03-09 14:19:24 -08:00
Brian Behlendorf
d0ef2f8337
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2010-03-09 14:19:23 -08:00
Brian Behlendorf
4a7b8629d5
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2010-03-09 14:19:21 -08:00
Brian Behlendorf
dcd0eecf89
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-03-09 14:19:20 -08:00
Brian Behlendorf
68e3c94270
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2010-03-09 14:19:18 -08:00
Brian Behlendorf
bbdcc9ac52
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-03-09 14:19:17 -08:00
Brian Behlendorf
8310167805
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-03-09 14:19:16 -08:00
Brian Behlendorf
8e2b8a52f7
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2010-03-09 14:19:15 -08:00
Brian Behlendorf
9fc9e880ab
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2010-03-09 14:19:13 -08:00
Brian Behlendorf
cc3e0e6b01
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-03-09 14:19:12 -08:00
Brian Behlendorf
ed15654feb
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2010-03-09 14:19:10 -08:00
Brian Behlendorf
f3025c3875
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2010-03-09 14:19:09 -08:00
Brian Behlendorf
45b2e45354
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2010-03-09 14:19:07 -08:00
Brian Behlendorf
01dae884bc
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2010-03-09 14:19:06 -08:00
Brian Behlendorf
9d8767dfb2
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2010-03-09 14:19:04 -08:00
Brian Behlendorf
4d306e2583
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2010-03-09 14:19:03 -08:00
Brian Behlendorf
c09ab40097
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2010-03-09 14:19:02 -08:00
Brian Behlendorf
bd81c6a5d0
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2010-03-09 14:19:00 -08:00
Brian Behlendorf
d01019d8a3
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-03-09 14:18:58 -08:00
Brian Behlendorf
ddf8afb06b
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-03-09 14:18:57 -08:00
Brian Behlendorf
49ea943914
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-03-09 14:18:56 -08:00
Brian Behlendorf
c60984f102
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-03-09 14:18:54 -08:00
Brian Behlendorf
774f7c02b1
Ignore unsigned module build products
...
Along with the addition of signed kernel modules in newer kernel
we have a few new build products we need to ignore. LKLM has the
whole thread for those interested: http://lkml.org/lkml/2007/2/14/164
2010-03-09 14:14:09 -08:00
Ricardo M. Correia
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
Brian Behlendorf
26b2ec2cd9
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-03-09 13:25:36 -08:00
Brian Behlendorf
19eef8ad39
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-03-09 13:24:30 -08:00
Brian Behlendorf
9fa502c50b
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-03-09 13:24:29 -08:00
Brian Behlendorf
e218fd13e8
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-03-09 13:24:28 -08:00
Brian Behlendorf
ef359aee66
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-03-09 13:24:27 -08:00
Brian Behlendorf
f2ab1fea36
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-03-09 13:24:27 -08:00