9cf9d0120f
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2010-05-18 10:38:19 -07:00
a192d7c98e
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2010-05-18 10:38:17 -07:00
62926f6f71
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2010-05-18 10:38:16 -07:00
de5a9a8a8c
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2010-05-18 10:38:14 -07:00
dca183a93d
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2010-05-18 10:38:13 -07:00
7e53b83095
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2010-05-18 10:38:11 -07:00
4faf0f20b5
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2010-05-18 10:38:09 -07:00
678c3e9143
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-05-18 10:38:07 -07:00
c8c7d1ce8e
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-05-18 10:38:06 -07:00
4a57dc24d7
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-05-18 10:38:04 -07:00
cc14ed0471
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-05-18 10:38:03 -07:00
91ac110c9c
Update COPYRIGHT and DISCLAIMER.
...
Update the COPYRIGHT and DISCLAIMER in an attempt to be clear about
the copyright and licensing issues.
2010-05-18 10:32:23 -07:00
d404dd1dad
Minor spec file cleanup for srpm case.
...
Ensure kpkg is defined is srpm case before using it to define
the krequires macro. Interestingly this is not an issue for
rpm-4.7.1-4 but it is for rpm-4.4.2.3-18.
2010-05-18 10:08:29 -07:00
b79b434e68
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-14 12:54:05 -07:00
98d5d8bd50
Add missing include path for FMA aware zpool command.
2010-05-14 11:57:48 -07:00
950a76951e
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-14 11:00:50 -07:00
20ee89f0f2
Add nvpair_alloc_fixed.c in to libnvpair build.
2010-05-14 10:55:02 -07:00
75aeefed1d
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-04-29 12:33:13 -07:00
98660aec20
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-04-29 12:32:01 -07:00
82782d7874
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-04-29 12:32:00 -07:00
aa4a91aef5
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-04-29 12:32:00 -07:00
354bebb795
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-04-29 12:31:59 -07:00
89154c98f9
Update build system to include nvpair_alloc_fixed.c.
2010-04-29 12:24:25 -07:00
f26fce7b17
Strip ident pragma from module/nvpair/nvpair_alloc_fixed.c
2010-04-29 12:23:12 -07:00
4fdfc60d1d
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-04-29 12:05:48 -07:00
66ba722b0a
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-04-29 12:04:36 -07:00
49dff0437f
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-04-29 12:04:35 -07:00
620a5ae89b
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-04-29 12:04:33 -07:00
f3017eccb7
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-04-29 12:04:33 -07:00
b9610ade84
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-04-29 12:04:33 -07:00
7a062682fb
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-04-29 12:04:32 -07:00
9c10b70375
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-04-29 12:04:31 -07:00
9d8e4f07ff
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2010-04-29 12:04:30 -07:00
dcf9769135
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-04-29 12:04:28 -07:00
d4ee043aaf
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-04-29 12:04:27 -07:00
3b31b7c0e8
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
2010-04-29 12:04:26 -07:00
ec11b6cecb
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
2010-04-29 12:04:26 -07:00
0d327d93b6
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2010-04-29 12:04:25 -07:00
1264752aa8
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2010-04-29 12:04:24 -07:00
2fbc59f539
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2010-04-29 12:04:23 -07:00
c0b678ce5e
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2010-04-29 12:04:23 -07:00
937c0f121a
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2010-04-29 12:04:22 -07:00
c880752748
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2010-04-29 12:04:21 -07:00
4d4cda51e2
Merge commit 'refs/top-bases/fix-list' into fix-list
2010-04-29 12:04:20 -07:00
0ff8a25a8a
Merge branch 'fix-list' into refs/top-bases/fix-branch
2010-04-29 12:04:20 -07:00
cf4e5324e9
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-04-29 12:04:18 -07:00
eb6835bf73
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-04-29 12:04:18 -07:00
695903c308
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2010-04-29 12:04:17 -07:00
036db491b4
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2010-04-29 12:04:17 -07:00
1a18829f86
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-04-29 12:04:15 -07:00
Brian Behlendorf