Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity
19,112 Commits 42 Branches 132 Tags 226 MiB
Commit Graph

19112 Commits

Author SHA1 Message Date
Brian Behlendorf cbe9fd91cb Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-06-14 14:43:41 -07:00
Brian Behlendorf 47e0108ff6 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-06-14 14:43:39 -07:00
Brian Behlendorf 884cb149aa Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-06-14 14:43:33 -07:00
Brian Behlendorf f24e870625 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-06-14 14:43:31 -07:00
Brian Behlendorf 6c0259bc83 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-06-14 14:43:26 -07:00
Brian Behlendorf e35eb21d6a Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-14 14:43:24 -07:00
Brian Behlendorf 39f88233ec Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-06-14 14:43:18 -07:00
Brian Behlendorf 80f7cfa759 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-14 14:43:16 -07:00
Brian Behlendorf 3d6b6379cd Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-06-14 14:43:10 -07:00
Brian Behlendorf 3699b41583 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-06-14 14:43:07 -07:00
Brian Behlendorf 4152507366 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-14 14:43:02 -07:00
Brian Behlendorf f1b9fa56b3 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-06-14 14:43:00 -07:00
Brian Behlendorf bdf5763c0a Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-14 14:42:58 -07:00
Brian Behlendorf 9f9a451561 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-06-14 14:42:57 -07:00
Brian Behlendorf 622a3249a1 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2010-06-14 14:42:57 -07:00
Brian Behlendorf fc490c18b6 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2010-06-14 14:42:56 -07:00
Brian Behlendorf dd8f6da3da Update gcc-cast 
Fix new instances of missing casts or assumed types.
 2010-06-14 14:40:10 -07:00
Brian Behlendorf 1865838100 Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch 2010-05-28 22:23:53 -07:00
Brian Behlendorf 2d5e0d711a Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 
Conflicts:
	module/zfs/zil.c
 2010-05-28 22:23:23 -07:00
Brian Behlendorf 63532dab9f Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 
Conflicts:
	module/zfs/include/sys/zfs_context.h
 2010-05-28 22:22:13 -07:00
Brian Behlendorf b13a072a2c Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-05-28 22:21:37 -07:00
Brian Behlendorf 0c1b5a3ee8 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-05-28 22:21:36 -07:00
Brian Behlendorf 537c9ea2be Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-05-28 22:21:36 -07:00
Brian Behlendorf 61f5fa262e Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 
Conflicts:
	lib/libzpool/include/sys/zfs_context.h
 2010-05-28 22:21:07 -07:00
Brian Behlendorf 2d6e5286eb Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-05-28 22:20:37 -07:00
Brian Behlendorf c5f19d6f79 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-05-28 22:20:37 -07:00
Brian Behlendorf a054b40984 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 
Conflicts:
	cmd/zpool/zpool_main.c
 2010-05-28 22:20:07 -07:00
Brian Behlendorf 46f6003520 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-05-28 22:18:58 -07:00
Brian Behlendorf d07f996713 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 
Conflicts:
	module/zfs/zfs_ioctl.c
 2010-05-28 22:18:29 -07:00
Brian Behlendorf fe4485488c Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 
Conflicts:
	module/zcommon/include/sys/fs/zfs.h
	module/zfs/include/sys/zfs_ioctl.h
 2010-05-28 22:16:13 -07:00
Brian Behlendorf e27eb1d89e Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-05-28 22:15:08 -07:00
Brian Behlendorf b41143632b Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 
Conflicts:
	cmd/zpool/zpool_main.c
	cmd/zpool/zpool_vdev.c
	cmd/ztest/ztest.c
	lib/libzfs/libzfs_dataset.c
	lib/libzfs/libzfs_import.c
	lib/libzfs/libzfs_mount.c
	lib/libzfs/libzfs_pool.c
	lib/libzfs/libzfs_sendrecv.c
	lib/libzpool/include/sys/zfs_context.h
	module/zcommon/include/sys/fs/zfs.h
	module/zcommon/zfs_comutil.c
	module/zfs/arc.c
	module/zfs/dmu.c
	module/zfs/dmu_objset.c
	module/zfs/dmu_send.c
	module/zfs/dmu_tx.c
	module/zfs/dsl_dataset.c
	module/zfs/dsl_dir.c
	module/zfs/dsl_scrub.c
	module/zfs/fm.c
	module/zfs/include/sys/dmu.h
	module/zfs/include/sys/fm/fs/zfs.h
	module/zfs/include/sys/fm/protocol.h
	module/zfs/include/sys/spa.h
	module/zfs/include/sys/zfs_context.h
	module/zfs/include/sys/zfs_ioctl.h
	module/zfs/include/sys/zvol.h
	module/zfs/spa.c
	module/zfs/spa_boot.c
	module/zfs/spa_history.c
	module/zfs/spa_misc.c
	module/zfs/txg.c
	module/zfs/vdev.c
	module/zfs/zfs_fm.c
	module/zfs/zfs_ioctl.c
	module/zfs/zfs_replay.c
	module/zfs/zfs_znode.c
	module/zfs/zil.c
	module/zfs/zio.c
 2010-05-28 22:14:39 -07:00
Brian Behlendorf d78690fcd9 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 
Conflicts:
	cmd/ztest/ztest.c
 2010-05-28 21:44:27 -07:00
Brian Behlendorf 804b4e0210 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-05-28 21:42:29 -07:00
Brian Behlendorf 13ba3d23f3 Merge commit 'refs/top-bases/linux-user-util' into linux-user-util 
Conflicts:
	lib/libzfs/libzfs_sendrecv.c
 2010-05-28 21:42:14 -07:00
Brian Behlendorf 8c67d72771 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 
Conflicts:
	cmd/zpool/zpool_main.c
	cmd/zpool/zpool_vdev.c
	lib/libzfs/libzfs_dataset.c
	lib/libzfs/libzfs_import.c
	lib/libzfs/libzfs_mount.c
	lib/libzfs/libzfs_pool.c
 2010-05-28 21:41:17 -07:00
Brian Behlendorf e776fc7fa7 Merge commit 'refs/top-bases/linux-unused' into linux-unused 
Conflicts:
	lib/libzpool/include/sys/zfs_context.h
 2010-05-28 21:33:46 -07:00
Brian Behlendorf ad4ae1c1e9 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-28 21:32:40 -07:00
Brian Behlendorf 3211073f1f Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-05-28 21:32:23 -07:00
Brian Behlendorf 5e8f78191e Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 
Conflicts:
	module/zfs/dmu_send.c
	module/zfs/spa_history.c
	module/zfs/txg.c
	module/zfs/zfs_ioctl.c
 2010-05-28 21:31:31 -07:00
Brian Behlendorf a6c16054e5 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 
Conflicts:
	module/zcommon/include/sys/fs/zfs.h
	module/zfs/dmu.c
	module/zfs/dsl_dataset.c
	module/zfs/include/sys/dmu.h
	module/zfs/include/sys/spa.h
	module/zfs/include/sys/zfs_ioctl.h
	module/zfs/include/sys/zvol.h
	module/zfs/zfs_replay.c
	module/zfs/zfs_znode.c
 2010-05-28 21:26:02 -07:00
Brian Behlendorf 6860ec4c1d Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 
Conflicts:
	module/zfs/zfs_ioctl.c
 2010-05-28 16:58:21 -07:00
Brian Behlendorf 010e4e2f97 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-05-28 16:43:15 -07:00
Brian Behlendorf 51ab52a682 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-05-28 16:42:44 -07:00
Brian Behlendorf 7008960b9e Merge commit 'refs/top-bases/linux-events' into linux-events 
Conflicts:
	lib/libzpool/include/sys/zfs_context.h
	module/zcommon/include/sys/fs/zfs.h
	module/zfs/dsl_scrub.c
	module/zfs/fm.c
	module/zfs/include/sys/fm/fs/zfs.h
	module/zfs/include/sys/fm/protocol.h
	module/zfs/include/sys/spa.h
	module/zfs/include/sys/zfs_context.h
	module/zfs/spa.c
	module/zfs/spa_misc.c
	module/zfs/vdev.c
	module/zfs/zfs_fm.c
 2010-05-28 16:42:29 -07:00
Brian Behlendorf 82b9a38cdb Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-28 16:01:54 -07:00
Brian Behlendorf 97c49607ec Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 
Conflicts:
	module/zcommon/zfs_comutil.c
	module/zfs/arc.c
	module/zfs/dmu_objset.c
	module/zfs/dmu_tx.c
	module/zfs/dsl_dataset.c
	module/zfs/dsl_dir.c
	module/zfs/spa.c
	module/zfs/spa_boot.c
	module/zfs/spa_misc.c
	module/zfs/vdev.c
	module/zfs/zil.c
	module/zfs/zio.c
 2010-05-28 16:01:35 -07:00
Brian Behlendorf e2ca9a51c0 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-05-28 15:46:16 -07:00
Brian Behlendorf 812761eac5 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 
Conflicts:
	cmd/ztest/ztest.c
 2010-05-28 15:46:10 -07:00
Brian Behlendorf 9fa832ed93 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-05-28 15:45:43 -07:00