e4de1eac10
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2010-05-18 10:38:54 -07:00
6bcbd721e8
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-05-18 10:38:53 -07:00
2a31babc32
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2010-05-18 10:38:53 -07:00
05b681529f
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-05-18 10:38:52 -07:00
0ee39c6bcf
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2010-05-18 10:38:51 -07:00
761a21b703
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-05-18 10:38:46 -07:00
7f98bd6058
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-05-18 10:38:46 -07:00
507095183c
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2010-05-18 10:38:45 -07:00
e807a794b5
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
2010-05-18 10:38:44 -07:00
d9351fcfa1
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2010-05-18 10:38:42 -07:00
fa1d5826a8
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2010-05-18 10:38:41 -07:00
d4718e3561
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-05-18 10:38:39 -07:00
da67a21e25
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-05-18 10:38:38 -07:00
4c66d1f365
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2010-05-18 10:38:36 -07:00
4315638f97
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2010-05-18 10:38:35 -07:00
4d47e60fd2
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2010-05-18 10:38:33 -07:00
13a3534f0f
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-05-18 10:38:32 -07:00
060a12639f
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2010-05-18 10:38:30 -07:00
7c1702bd20
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-05-18 10:38:29 -07:00
b445157739
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-05-18 10:38:27 -07:00
54a92ad587
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2010-05-18 10:38:25 -07:00
36e419eef6
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2010-05-18 10:38:23 -07:00
9db753ebe1
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-05-18 10:38:22 -07:00
048587908d
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2010-05-18 10:38:20 -07:00
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
a1658d8d17
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-14 13:31:32 -07:00
bb5e111dde
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-14 13:31:29 -07:00
d6f1f21cae
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-14 13:31:27 -07:00
08eb7517c4
Remove 3 symbols which no longer need to be exported.
...
EXPORT_SYMBOL(zfs_ereport_post);
EXPORT_SYMBOL(zfs_post_remove);
EXPORT_SYMBOL(zfs_post_autoreplace);
2010-05-14 13:00:22 -07:00
feb723fa7d
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-14 12:55:10 -07:00
3e9b8dc559
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-05-14 12:55:10 -07:00
106e92b2df
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-05-14 12:55:08 -07:00
d186e0ca0c
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-05-14 12:55:01 -07:00
d89c845543
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-05-14 12:54:59 -07:00
143c34eecf
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-05-14 12:54:52 -07:00
474981ffac
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-14 12:54:50 -07:00
b144320bb9
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-05-14 12:54:43 -07:00
89396b5fff
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-05-14 12:54:41 -07:00
Brian Behlendorf