Commit Graph

13479 Commits

Author SHA1 Message Date
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 ea7cefc78f Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-07-02 14:02:44 -07:00
Brian Behlendorf 7742e4fe87 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-07-02 14:02:42 -07:00
Brian Behlendorf 520d0ef42d Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-07-02 14:02:37 -07:00
Brian Behlendorf 28d6da84eb Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-02 14:02:35 -07:00
Brian Behlendorf e5c646afc8 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-07-02 14:02:30 -07:00
Brian Behlendorf 1cbbdfc9e4 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-07-02 14:02:28 -07:00
Brian Behlendorf 92f0c544a0 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-02 14:02:23 -07:00
Brian Behlendorf 4676ae36b5 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-02 14:02:22 -07:00
Brian Behlendorf 4a2292f73c Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-07-02 14:02:16 -07:00
Brian Behlendorf 8a3c507e6f Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-02 14:02:14 -07:00
Brian Behlendorf 55a626e27e Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-07-02 14:02:09 -07:00
Brian Behlendorf 18b4e0cc97 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-02 14:02:08 -07:00
Brian Behlendorf 7fde40534c Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-07-02 14:02:02 -07:00
Brian Behlendorf 630ee6d753 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-07-02 14:02:00 -07:00
Brian Behlendorf 3ae7729c1e Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-07-02 14:01:55 -07:00
Brian Behlendorf 4ced1b2940 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-07-02 14:01:53 -07:00
Brian Behlendorf 3c80f8922b Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-07-02 14:01:48 -07:00
Brian Behlendorf 7e4b3ab96f Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-07-02 14:01:46 -07:00
Brian Behlendorf 8096193a4d Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-07-02 14:01:41 -07:00
Brian Behlendorf bdc02b09ec Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-02 14:01:39 -07:00
Brian Behlendorf 443f6dd325 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-07-02 14:01:34 -07:00
Brian Behlendorf 026c46347f Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-02 14:01:33 -07:00
Brian Behlendorf 2ae5ffedda Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-07-02 14:01:28 -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 8c3bd2eb6c Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-07-02 14:01:16 -07:00
Brian Behlendorf d067ffa8b5 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-02 14:01:14 -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 788f4dc5ce Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-07-02 14:01:04 -07:00
Brian Behlendorf 1e1db6f88a Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-07-02 14:01:02 -07:00
Brian Behlendorf fd2dc8ce19 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-07-02 14:00:57 -07:00
Brian Behlendorf 99dbc034b2 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-07-02 14:00:55 -07:00
Brian Behlendorf 52bb1e62b1 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-07-02 14:00:50 -07:00
Brian Behlendorf 1234dde584 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-02 14:00:48 -07:00
Brian Behlendorf 7179536d61 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-07-02 14:00:43 -07:00
Brian Behlendorf 0bf1e6efe6 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-07-02 14:00:41 -07:00
Brian Behlendorf 4df1e355a3 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-07-02 14:00:36 -07:00
Brian Behlendorf f8b5124242 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-07-02 14:00:34 -07:00