ed83735903
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-03-09 14:19:26 -08:00
fd94e31370
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-03-09 14:19:26 -08:00
490f689b9c
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2010-03-09 14:19:24 -08:00
d0ef2f8337
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2010-03-09 14:19:23 -08:00
4a7b8629d5
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2010-03-09 14:19:21 -08:00
dcd0eecf89
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-03-09 14:19:20 -08:00
68e3c94270
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2010-03-09 14:19:18 -08:00
bbdcc9ac52
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-03-09 14:19:17 -08:00
8310167805
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-03-09 14:19:16 -08:00
8e2b8a52f7
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2010-03-09 14:19:15 -08:00
9fc9e880ab
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2010-03-09 14:19:13 -08:00
cc3e0e6b01
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-03-09 14:19:12 -08:00
ed15654feb
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2010-03-09 14:19:10 -08:00
f3025c3875
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2010-03-09 14:19:09 -08:00
45b2e45354
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2010-03-09 14:19:07 -08:00
01dae884bc
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2010-03-09 14:19:06 -08:00
9d8767dfb2
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2010-03-09 14:19:04 -08:00
4d306e2583
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2010-03-09 14:19:03 -08:00
c09ab40097
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2010-03-09 14:19:02 -08:00
bd81c6a5d0
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2010-03-09 14:19:00 -08:00
d01019d8a3
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-03-09 14:18:58 -08:00
ddf8afb06b
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-03-09 14:18:57 -08:00
49ea943914
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-03-09 14:18:56 -08:00
c60984f102
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-03-09 14:18:54 -08:00
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
cf76c2d203
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-03-09 13:53:24 -08:00
b22f45bebc
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-03-09 13:53:22 -08:00
f04c01c945
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-03-09 13:53:21 -08:00
ba0a56bb2a
Fix struct ht_lock padding in arc.c.
...
This was leading to a compilation error because in Linux, sizeof
(kmutex_t) can be larger than 64 in some circumstances (e.g. with
debugging and lockdep enabled).
The code was previously fixed to align the structure to 256 bytes,
but a better fix is to align it to the next multiple of 64 bytes.
2010-03-09 13:49:36 -08:00
f0977a90e1
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-03-09 13:43:32 -08:00
f120b94558
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-03-09 13:43:30 -08:00
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
059f5b26df
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-03-09 13:26:13 -08:00
c56d603f14
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-03-09 13:26:11 -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
Brian Behlendorf
Ricardo M. Correia