Commit Graph

14672 Commits

Author SHA1 Message Date
Brian Behlendorf 3da342285d Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-08-04 16:19:59 -07:00
Brian Behlendorf f71251c6a5 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-08-04 16:19:57 -07:00
Brian Behlendorf d80e2a5a1a Tag zfs-0.4.5 for real
Update TODO list.
2009-08-04 16:12:28 -07:00
Brian Behlendorf 37cbbc0afb Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-08-04 15:59:07 -07:00
Brian Behlendorf aa56b7a7d4 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-08-04 15:59:04 -07:00
Brian Behlendorf 542d39af40 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-08-04 15:58:54 -07:00
Brian Behlendorf 754c2e2025 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-08-04 15:58:52 -07:00
Brian Behlendorf 58f043dd7d Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-08-04 15:58:41 -07:00
Brian Behlendorf 0803564cbe Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-08-04 15:58:39 -07:00
Brian Behlendorf 60462876c3 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-08-04 15:58:28 -07:00
Brian Behlendorf 628a3cb70d Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-08-04 15:58:25 -07:00
Brian Behlendorf dbc2c7f72b Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-08-04 15:58:15 -07:00
Brian Behlendorf 1dd0a6bab1 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-08-04 15:58:13 -07:00
Brian Behlendorf 74a91baa39 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-08-04 15:58:02 -07:00
Brian Behlendorf ddc0a2d4fe Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-08-04 15:57:58 -07:00
Brian Behlendorf b66888ee95 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-08-04 15:57:47 -07:00
Brian Behlendorf 4eae170dc5 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-08-04 15:57:44 -07:00
Brian Behlendorf 111056489d Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-08-04 15:57:34 -07:00
Brian Behlendorf fe87fabe55 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-08-04 15:57:31 -07:00
Brian Behlendorf cff53420e0 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-08-04 15:57:21 -07:00
Brian Behlendorf 20b364b7aa Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-08-04 15:57:17 -07:00
Brian Behlendorf df1d093811 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-08-04 15:57:06 -07:00
Brian Behlendorf 4b1d370e4f Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-08-04 15:57:03 -07:00
Brian Behlendorf 7e3a808c8d Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-08-04 15:56:53 -07:00
Brian Behlendorf f73936be84 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-08-04 15:56:50 -07:00
Brian Behlendorf d38d5d88a1 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-08-04 15:56:40 -07:00
Brian Behlendorf 1bfe0d5177 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-08-04 15:56:36 -07:00
Brian Behlendorf ed8ca1a368 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-08-04 15:56:25 -07:00
Brian Behlendorf a089c64daa Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-08-04 15:56:23 -07:00
Brian Behlendorf f2018fdf21 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-08-04 15:56:21 -07:00
Brian Behlendorf 8e9957355b Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-08-04 15:56:01 -07:00
Brian Behlendorf a7a6539d95 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-08-04 15:55:57 -07:00
Brian Behlendorf 56204aacac Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-08-04 15:55:55 -07:00
Brian Behlendorf 671da4b5ff Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-08-04 15:55:36 -07:00
Brian Behlendorf c3c87bf545 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-08-04 15:55:34 -07:00
Brian Behlendorf dd53e58506 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-08-04 15:55:23 -07:00
Brian Behlendorf 295499a5b0 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-08-04 15:55:18 -07:00
Brian Behlendorf fd83b0b954 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-08-04 15:55:08 -07:00
Brian Behlendorf e86a0e8ad1 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-08-04 15:55:06 -07:00
Brian Behlendorf 886dfcc372 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-08-04 15:54:55 -07:00
Brian Behlendorf d41ab91034 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-08-04 15:54:53 -07:00
Brian Behlendorf b2c0d00644 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-08-04 15:54:43 -07:00
Brian Behlendorf 74f5a110b7 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-08-04 15:54:35 -07:00
Brian Behlendorf 72fc3eca7e Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-08-04 15:54:25 -07:00
Brian Behlendorf d0113c9769 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-08-04 15:54:22 -07:00
Brian Behlendorf f88cbd6535 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-08-04 15:54:21 -07:00
Brian Behlendorf 8c28ed9bff Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-08-04 15:54:19 -07:00
Brian Behlendorf d85e9f79ce Merge commit 'refs/top-bases/feature-branch' into feature-branch 2009-08-04 15:54:18 -07:00
Brian Behlendorf adcc63f658 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2009-08-04 15:54:17 -07:00
Brian Behlendorf 2ee19b34ea Refresh ChangeLog 2009-08-04 15:45:48 -07:00