Commit Graph

3125 Commits

Author SHA1 Message Date
Brian Behlendorf f8f0e924eb Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 2009-07-06 13:12:34 -07:00
Brian Behlendorf 5b629493e0 Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2009-07-06 13:12:34 -07:00
Brian Behlendorf 01c3cfc58f Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
Conflicts:

	module/zfs/zil.c
2009-07-06 13:12:23 -07:00
Brian Behlendorf 3ada0935a3 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2009-07-06 13:11:56 -07:00
Brian Behlendorf a1ccb00b7e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
Conflicts:

	cmd/ztest/ztest.c
	module/zfs/zil.c
2009-07-06 13:11:34 -07:00
Brian Behlendorf 697153c6bb Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-07-02 17:08:38 -07:00
Brian Behlendorf 205e37a6d5 Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch 2009-07-02 17:08:36 -07:00
Brian Behlendorf dbaf4f6c0f Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
Conflicts:

	cmd/ztest/ztest.c
2009-07-02 17:08:30 -07:00
Brian Behlendorf 5ca5c12aa7 Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2009-07-02 17:07:59 -07:00
Brian Behlendorf 480b03791d Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
Conflicts:

	lib/libzfs/libzfs_dataset.c
2009-07-02 17:07:52 -07:00
Brian Behlendorf c66757e332 Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
Conflicts:

	module/zfs/fletcher.c
2009-07-02 17:07:06 -07:00
Brian Behlendorf a06a428e15 Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
Conflicts:

	cmd/zdb/zdb_il.c
	cmd/zinject/zinject.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/dmu_object.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_errlog.c
	module/zfs/spa_history.c
	module/zfs/zap.c
	module/zfs/zap_leaf.c
	module/zfs/zap_micro.c
2009-07-02 17:06:20 -07:00
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