Brian Behlendorf
060a12639f
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2010-05-18 10:38:30 -07:00
Brian Behlendorf
7c1702bd20
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-05-18 10:38:29 -07:00
Brian Behlendorf
b445157739
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-05-18 10:38:27 -07:00
Brian Behlendorf
54a92ad587
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2010-05-18 10:38:25 -07:00
Brian Behlendorf
36e419eef6
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2010-05-18 10:38:23 -07:00
Brian Behlendorf
9db753ebe1
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-05-18 10:38:22 -07:00
Brian Behlendorf
048587908d
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2010-05-18 10:38:20 -07:00
Brian Behlendorf
9cf9d0120f
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2010-05-18 10:38:19 -07:00
Brian Behlendorf
a192d7c98e
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2010-05-18 10:38:17 -07:00
Brian Behlendorf
62926f6f71
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2010-05-18 10:38:16 -07:00
Brian Behlendorf
de5a9a8a8c
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2010-05-18 10:38:14 -07:00
Brian Behlendorf
dca183a93d
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2010-05-18 10:38:13 -07:00
Brian Behlendorf
7e53b83095
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2010-05-18 10:38:11 -07:00
Brian Behlendorf
4faf0f20b5
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2010-05-18 10:38:09 -07:00
Brian Behlendorf
678c3e9143
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-05-18 10:38:07 -07:00
Brian Behlendorf
c8c7d1ce8e
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-05-18 10:38:06 -07:00
Brian Behlendorf
4a57dc24d7
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-05-18 10:38:04 -07:00
Brian Behlendorf
cc14ed0471
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-05-18 10:38:03 -07:00
Brian Behlendorf
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
Brian Behlendorf
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
Brian Behlendorf
98add009b7
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-14 12:53:38 -07:00
Brian Behlendorf
98d5d8bd50
Add missing include path for FMA aware zpool command.
2010-05-14 11:57:48 -07:00
Brian Behlendorf
d18f100fb7
Revert zfs_ioctl.c related changes.
...
All the changes required to cleanly integrate with linux style
devices are being moved to their own topic branch. It was abouti
to get to the point where too many topic branches each wanted to
tweak this code and it was getting confusing. To simplify this
all /dev/zfs device related changes are being moved to the
linux-kernel-device topic branch.
2010-05-14 11:24:36 -07:00
Brian Behlendorf
6248e67a87
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-14 11:00:23 -07:00
Brian Behlendorf
20ee89f0f2
Add nvpair_alloc_fixed.c in to libnvpair build.
2010-05-14 10:55:02 -07:00
Brian Behlendorf
7d37312f6c
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-04-29 12:32:49 -07:00
Brian Behlendorf
98660aec20
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-04-29 12:32:01 -07:00
Brian Behlendorf
82782d7874
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-04-29 12:32:00 -07:00
Brian Behlendorf
aa4a91aef5
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-04-29 12:32:00 -07:00
Brian Behlendorf
354bebb795
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-04-29 12:31:59 -07:00
Brian Behlendorf
89154c98f9
Update build system to include nvpair_alloc_fixed.c.
2010-04-29 12:24:25 -07:00
Brian Behlendorf
f26fce7b17
Strip ident pragma from module/nvpair/nvpair_alloc_fixed.c
2010-04-29 12:23:12 -07:00
Brian Behlendorf
be442baea7
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-04-29 12:05:23 -07:00
Brian Behlendorf
66ba722b0a
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-04-29 12:04:36 -07:00
Brian Behlendorf
49dff0437f
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-04-29 12:04:35 -07:00
Brian Behlendorf
620a5ae89b
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-04-29 12:04:33 -07:00
Brian Behlendorf
f3017eccb7
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-04-29 12:04:33 -07:00
Brian Behlendorf
b9610ade84
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-04-29 12:04:33 -07:00
Brian Behlendorf
7a062682fb
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-04-29 12:04:32 -07:00
Brian Behlendorf
9c10b70375
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-04-29 12:04:31 -07:00
Brian Behlendorf
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
Brian Behlendorf
dcf9769135
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-04-29 12:04:28 -07:00
Brian Behlendorf
d4ee043aaf
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-04-29 12:04:27 -07:00
Brian Behlendorf
3b31b7c0e8
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
2010-04-29 12:04:26 -07:00
Brian Behlendorf
ec11b6cecb
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
2010-04-29 12:04:26 -07:00
Brian Behlendorf
0d327d93b6
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2010-04-29 12:04:25 -07:00
Brian Behlendorf
1264752aa8
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2010-04-29 12:04:24 -07:00
Brian Behlendorf
2fbc59f539
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2010-04-29 12:04:23 -07:00
Brian Behlendorf
c0b678ce5e
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2010-04-29 12:04:23 -07:00
Brian Behlendorf
937c0f121a
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2010-04-29 12:04:22 -07:00