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
ffaac01490
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-14 13:31:32 -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
1eefcf593d
New TopGit dependency: linux-debug-zerocopy
2010-05-14 13:29:41 -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
bc92365d32
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-14 12:55:12 -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
2a39c44637
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-14 12:54:34 -07:00
0ea6b5a042
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-14 12:54:33 -07:00
3b47d76d8e
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-14 12:54:25 -07:00
bbfb1eeb4c
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-14 12:54:23 -07:00
cb7be901de
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-14 12:54:16 -07:00
9d8124099b
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-14 12:54:14 -07:00
2fdc73fada
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-14 12:54:07 -07:00
b79b434e68
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-14 12:54:05 -07:00
41456b2bd7
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-05-14 12:53:58 -07:00
06f00866eb
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-05-14 12:53:56 -07:00
a57ba8a2ec
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-14 12:53:49 -07:00
0ff45595f2
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-14 12:53:47 -07:00
6ded08648c
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-14 12:53:40 -07:00
98add009b7
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-14 12:53:38 -07:00
4afb1dc2f7
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-14 12:53:31 -07:00
da073cac3d
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-14 12:53:29 -07:00
d333ae7ec9
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-14 12:53:21 -07:00
c550f0172b
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-14 12:53:20 -07:00
7d30d5032a
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-05-14 12:53:12 -07:00
Brian Behlendorf