Commit Graph

10660 Commits

Author SHA1 Message Date
Brian Behlendorf 8cc084c25e Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-02-18 14:34:50 -08:00
Brian Behlendorf 855a863bb2 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-02-18 14:34:48 -08:00
Brian Behlendorf 9f4865e4ca Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-02-18 14:34:45 -08:00
Brian Behlendorf 90209c97f0 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-02-18 14:34:30 -08:00
Brian Behlendorf f90944a9f0 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-02-18 14:34:25 -08:00
Brian Behlendorf 3714c9d00a Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-02-18 14:34:17 -08:00
Brian Behlendorf 76c1dd44ab Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-02-18 14:34:14 -08:00
Brian Behlendorf 10c46e6670 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-02-18 14:34:06 -08:00
Brian Behlendorf f78c15d84f Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-02-18 14:34:03 -08:00
Brian Behlendorf e3e8443931 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-02-18 14:33:52 -08:00
Brian Behlendorf 7e21796d7e Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-02-18 14:33:48 -08:00
Brian Behlendorf 45b85ad2df Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-02-18 14:33:40 -08:00
Brian Behlendorf 6c27c02cf2 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-02-18 14:33:38 -08:00
Brian Behlendorf 83dbe40ab7 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-02-18 14:33:30 -08:00
Brian Behlendorf cb82501971 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-02-18 14:33:28 -08:00
Brian Behlendorf 8090a9a908 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:

	cmd/zpool/zpool_main.c
2009-02-18 14:31:46 -08:00
Brian Behlendorf c893c7cf3d Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-02-18 14:30:56 -08:00
Brian Behlendorf 7872d84be6 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-02-18 14:30:54 -08:00
Brian Behlendorf 623c1e1834 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-02-18 14:30:52 -08:00
Brian Behlendorf 20522feba0 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2009-02-18 14:30:50 -08:00
Brian Behlendorf 73942e84b1 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2009-02-18 14:30:49 -08:00
Brian Behlendorf 87307ab12a Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2009-02-18 14:30:48 -08:00
Brian Behlendorf f8e5c227fe Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-02-18 14:30:45 -08:00
Brian Behlendorf 1e606f156b Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-02-18 14:30:43 -08:00
Brian Behlendorf 4e50779f44 Merge branch 'fix-list' into refs/top-bases/fix-branch
Conflicts:

	module/zfs/arc.c
2009-02-18 14:30:38 -08:00
Brian Behlendorf dbc3a5ec55 Merge commit 'refs/top-bases/fix-list' into fix-list
Conflicts:

	module/zfs/arc.c
2009-02-18 14:29:48 -08:00
Brian Behlendorf 4cc0df153d Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2009-02-18 14:29:24 -08:00
Brian Behlendorf 3ef12f42a2 Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2009-02-18 14:29:23 -08:00
Brian Behlendorf f257cc3a9e Merge branch 'fix-stack' into refs/top-bases/fix-branch 2009-02-18 14:29:20 -08:00
Brian Behlendorf 7fe1b71533 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2009-02-18 14:29:19 -08:00
Brian Behlendorf d3bf596f03 Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2009-02-18 14:29:16 -08:00
Brian Behlendorf 56aabda0f9 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2009-02-18 14:29:16 -08:00
Brian Behlendorf 463205c1bb Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2009-02-18 14:29:12 -08:00
Brian Behlendorf 15f5ddebdf Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
Conflicts:

	lib/libzpool/kernel.c
2009-02-18 14:29:08 -08:00
Brian Behlendorf 0c0f306f14 Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch 2009-02-18 14:28:46 -08:00
Brian Behlendorf baf389bedc Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2009-02-18 14:28:46 -08:00
Brian Behlendorf 40839628e9 Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2009-02-18 14:28:43 -08:00
Brian Behlendorf f3f9572ef9 Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2009-02-18 14:28:42 -08:00
Brian Behlendorf fa06351125 Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2009-02-18 14:28:39 -08:00
Brian Behlendorf 109a1d5b16 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2009-02-18 14:28:38 -08:00
Brian Behlendorf 0dd5d4dae3 Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch 2009-02-18 14:28:34 -08:00
Brian Behlendorf 224985aa70 Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2009-02-18 14:28:34 -08:00
Brian Behlendorf e3f59d5034 Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2009-02-18 14:28:31 -08:00
Brian Behlendorf d6e8154947 Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2009-02-18 14:28:30 -08:00
Brian Behlendorf 145bd84478 Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch 2009-02-18 14:28:28 -08:00
Brian Behlendorf 404fd8578f Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2009-02-18 14:28:27 -08:00
Brian Behlendorf a6fe6c5a73 Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 2009-02-18 14:28:24 -08:00
Brian Behlendorf d190a5b9bd Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2009-02-18 14:28:23 -08:00
Brian Behlendorf 6fe19bd252 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
Conflicts:

	lib/libzpool/kernel.c
	module/zfs/arc.c
2009-02-18 14:28:15 -08:00
Brian Behlendorf 3ac1fca8dc Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2009-02-18 14:27:31 -08:00