Brian Behlendorf
091947219a
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-07-02 16:59:48 -07:00
Brian Behlendorf
bc330e731d
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2009-07-02 16:59:46 -07:00
Brian Behlendorf
8fd3bf3283
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2009-07-02 16:59:43 -07:00
Brian Behlendorf
244d656e28
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
...
Conflicts:
module/zfs/dmu.c
2009-07-02 16:59:39 -07:00
Brian Behlendorf
32dbbf89a4
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-07-02 16:58:37 -07:00
Brian Behlendorf
9550da2ba6
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
...
Conflicts:
module/zfs/arc.c
module/zfs/zio.c
2009-07-02 16:58:33 -07:00
Brian Behlendorf
bfb4271048
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-07-02 16:57:13 -07:00
Brian Behlendorf
44703f0029
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/arc.c
module/zfs/spa.c
2009-07-02 16:57:09 -07:00
Brian Behlendorf
d545a922f2
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-07-02 16:55:27 -07:00
Brian Behlendorf
eb0137f395
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/arc.c
module/zfs/dmu_objset.c
module/zfs/dsl_pool.c
module/zfs/spa.c
module/zfs/zfs_ioctl.c
2009-07-02 16:55:22 -07:00
Brian Behlendorf
7eceb3b637
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-07-02 16:52:12 -07:00
Brian Behlendorf
a5a71d128d
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/spa.c
2009-07-02 16:52:07 -07:00
Brian Behlendorf
0010c8c466
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2009-07-02 16:51:11 -07:00
Brian Behlendorf
5a2a5d64a5
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-07-02 16:51:09 -07:00
Brian Behlendorf
01f0f6a036
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2009-07-02 16:51:06 -07:00
Brian Behlendorf
f473a898f4
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2009-07-02 16:51:04 -07:00
Brian Behlendorf
dbe960383e
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2009-07-02 16:51:01 -07:00
Brian Behlendorf
0a437a8b22
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2009-07-02 16:51:00 -07:00
Brian Behlendorf
546408e1de
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-07-02 16:50:56 -07:00
Brian Behlendorf
b095bf444a
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
...
Conflicts:
cmd/zfs/zfs_main.c
lib/libzfs/libzfs_dataset.c
2009-07-02 16:50:53 -07:00
Brian Behlendorf
e2b2597751
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
cmd/zdb/zdb_il.c
cmd/zfs/zfs_main.c
cmd/zinject/zinject.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_graph.c
module/zcommon/include/sys/fm/fs/zfs.h
module/zcommon/include/zfs_deleg.h
module/zcommon/include/zfs_namecheck.h
module/zcommon/zfs_deleg.c
module/zcommon/zfs_namecheck.c
module/zcommon/zprop_common.c
module/zfs/arc.c
module/zfs/dmu.c
module/zfs/dmu_object.c
module/zfs/dmu_objset.c
module/zfs/dsl_pool.c
module/zfs/dsl_prop.c
module/zfs/fletcher.c
module/zfs/include/sys/dsl_deleg.h
module/zfs/include/sys/dsl_prop.h
module/zfs/include/sys/metaslab_impl.h
module/zfs/include/sys/spa_boot.h
module/zfs/include/sys/zap.h
module/zfs/include/sys/zap_impl.h
module/zfs/include/sys/zfs_context.h
module/zfs/include/sys/zfs_ctldir.h
module/zfs/include/sys/zfs_dir.h
module/zfs/include/sys/zfs_fuid.h
module/zfs/include/sys/zfs_ioctl.h
module/zfs/spa.c
module/zfs/spa_errlog.c
module/zfs/spa_history.c
module/zfs/zap.c
module/zfs/zap_leaf.c
module/zfs/zap_micro.c
module/zfs/zfs_ioctl.c
module/zfs/zio.c
2009-07-02 16:49:11 -07:00
Brian Behlendorf
e9f14862a5
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
module/zfs/dmu_objset.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/vdev_label.c
module/zfs/zio.c
2009-07-02 16:18:03 -07:00
Brian Behlendorf
9babb37438
Rebase master to b117
2009-07-02 15:44:48 -07:00
Brian Behlendorf
c3e23b404e
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-02 14:01:26 -07:00
Brian Behlendorf
48cb5099e2
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-02 14:01:25 -07:00
Brian Behlendorf
813923c2e6
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-02 14:01:13 -07:00
Brian Behlendorf
6187d3100e
Update ChangeLog
2009-07-02 13:56:29 -07:00
Brian Behlendorf
147cf2a952
Update zfs-module rependencies to require spl-modules
2009-07-02 13:29:33 -07:00
Brian Behlendorf
a226c396c2
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-02 10:51:17 -07:00
Brian Behlendorf
6e65be6cdb
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-02 10:51:16 -07:00
Brian Behlendorf
43d87ed5ba
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-02 10:51:05 -07:00
Brian Behlendorf
f984d28e0c
Cleanly handle --with-linux=NONE and --with-spl=NONE options
...
when used to generate source rpms. These should not be fatal
because we actually don't need them until we build the source
rpm. When doing mock build this is important because these
dependent rpms will only be installed if they are specificed
in the source rpms spec file.
2009-07-02 10:44:43 -07:00
Brian Behlendorf
c3526da6a3
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-01 14:41:18 -07:00
Brian Behlendorf
4b9cfd8ceb
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-01 14:41:17 -07:00
Brian Behlendorf
cea83abd84
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-01 14:41:06 -07:00
Brian Behlendorf
6e50f53cb1
Drop --with-linux and --with-spl options from user build.
2009-07-01 14:35:38 -07:00
Brian Behlendorf
3ba005afd9
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-01 12:56:35 -07:00
Brian Behlendorf
613aba41ce
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-01 12:56:35 -07:00
Brian Behlendorf
5bf6d6d222
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-01 12:56:23 -07:00
Brian Behlendorf
01ff9d82d5
Install zfs_config, zfs_unconfig, symbols in to correct location.
...
Provide a zfs.release file as part of the package.
2009-07-01 12:51:06 -07:00
Brian Behlendorf
bfa8b02c2c
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-01 11:10:37 -07:00
Brian Behlendorf
d4721058bc
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-01 11:10:36 -07:00
Brian Behlendorf
8c684c8d85
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-01 11:10:24 -07:00
Brian Behlendorf
ef0a712858
Distro friendly build system / packaging improvements.
...
These changes bring the zfs-0.4.4 tree in to compliance with
the spl-0.4.4 packaging changes. The bottom line is 2 source
rpms and 4 binary rpms will now be generated when creating
packages there will be:
zfs-<version>.src.rpm
- Fully rebuildable source rpm for libzfs and utils.
zfs-modules-<version>.src.rpm
- Fully rebuildable source rpm for kernel modules.
zfs-<version>.<arch>.rpm
- Binary rpm for libzfs and utils. The utils in this package are
compatible with all zfs-module rpms of the same version.
zfs-devel-<version>.<arch>.rpm
- Binary rpm containing headers for building against libzfs libraries.
zfs-modules-<verion>-<kernel>.arch.rpm
- Binary rpm containing the kernel modules for a specific kernel build.
The package name contains the kernel version and you should have one
of these packages installed to match every kernel on your system.
zfs-modules-devel-<verion>-<kernel>.arch.rpm
- Binary rpm containing development header and module symbols needed
for building additional kernel modules which are dependent on the
zfs module stack.
Expect minor interations on these changes as I validate they work
properly on CHAOS, RHEL, Fedora, and SLES style distros.
2009-07-01 10:53:05 -07:00
Brian Behlendorf
514f9f626c
Merge commit 'refs/remotes/origin/linux-have-uio-rw' into HEAD
2009-06-26 14:34:55 -07:00
Brian Behlendorf
af590ac979
Merge commit 'refs/remotes/origin/linux-debug-zerocopy' into HEAD
2009-06-26 14:34:54 -07:00
Brian Behlendorf
ddbb1fcb7c
Merge commit 'refs/remotes/origin/linux-kernel-module' into HEAD
2009-06-26 14:34:44 -07:00
Brian Behlendorf
4fbded409d
Merge commit '0f1012be0aeb6f5f27966c80321db79a9b1aaec3' into zfs-branch
2009-06-26 14:33:53 -07:00
Brian Behlendorf
137276e3c9
Should be powerpc64 not powerpc (powerpc is unsupported)
2009-06-26 14:29:42 -07:00
Brian Behlendorf
d3359d6962
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-06-09 16:29:11 -07:00