diff --git a/.topdeps b/.topdeps index 607c231780..7f16cbcdd5 100644 --- a/.topdeps +++ b/.topdeps @@ -1,3 +1 @@ -gcc-branch -fix-branch -feature-branch +zfs-branch diff --git a/.topmsg b/.topmsg index 03967cdff5..0483ce70db 100644 --- a/.topmsg +++ b/.topmsg @@ -1,19 +1,6 @@ From: Brian Behlendorf -Subject: [PATCH] zfs branch +Subject: [PATCH] linux docs -Merged result of all changes which are relevant to both Solaris -and Linux builds of the ZFS code. These are changes where there -is a reasonable chance they will be accepted upstream. - -Additionally, since this is effectively the root of the linux -ZFS tree the core linux build system is added here. This -includes autogen.sh, configure.ac, m4 macros, some scripts/*, -and makefiles for all the core ZFS components. Linux-only -features which require tweaks to the build system should appear -on the relevant topic branches. All autotools products which -result from autogen.sh are commited to the linux-configure-branch. - -This branch also contains the META, ChangeLog, AUTHORS, TODO, -and README, files. +Documentation branch used simply to track historical results. Signed-off-by: Brian Behlendorf diff --git a/doc/analysis-spl-0.3.1/zfs-report.doc b/doc/analysis-spl-0.3.1/zfs-report.doc new file mode 100644 index 0000000000..34638b2ead Binary files /dev/null and b/doc/analysis-spl-0.3.1/zfs-report.doc differ diff --git a/doc/analysis-spl-0.3.1/zfs-report.odt b/doc/analysis-spl-0.3.1/zfs-report.odt new file mode 100644 index 0000000000..fd52861136 Binary files /dev/null and b/doc/analysis-spl-0.3.1/zfs-report.odt differ diff --git a/doc/analysis-spl-0.3.1/zfs-report.pdf b/doc/analysis-spl-0.3.1/zfs-report.pdf new file mode 100644 index 0000000000..8bf166709d Binary files /dev/null and b/doc/analysis-spl-0.3.1/zfs-report.pdf differ diff --git a/doc/analysis-spl-0.3.1/zfs-testing.ods b/doc/analysis-spl-0.3.1/zfs-testing.ods new file mode 100644 index 0000000000..39a84e4377 Binary files /dev/null and b/doc/analysis-spl-0.3.1/zfs-testing.ods differ diff --git a/doc/analysis-spl-0.3.1/zfs-testing.xls b/doc/analysis-spl-0.3.1/zfs-testing.xls new file mode 100644 index 0000000000..f6de1e9847 Binary files /dev/null and b/doc/analysis-spl-0.3.1/zfs-testing.xls differ