Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'refs/top-bases/top' into topzfs-0.4.5 | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
|\ | |||||
| * | Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| |\ | |||||
| | * | Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | |\ | |||||
| | | * | Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 0 | -0/+0 |
| | | |\ | |||||
| | | | * | Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | | |\ | |||||
| | | * | \ | Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 0 | -0/+0 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge commit 'refs/top-bases/linux-ztest' into linux-ztest | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | | |\ \ \ | | | | | | |/ | | | | | |/| | |||||
| | | * | | | | Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 0 | -0/+0 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| | | |||||
| | | * | | | | | Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 0 | -0/+0 |
| | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ | Merge commit 'refs/top-bases/linux-unused' into linux-unused | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | | | |||||
| | | * | | | | | | Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge commit 'refs/top-bases/linux-libspl' into linux-libspl | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | | |\ \ \ \ \ \ | | | | | | |/ / / / | | | | | |/| | | | | |||||
| | | * | | | | | | | Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| | | | | | |||||
| | | * | | | | | | | | Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | |/| | | | | | | |||||
| | | * | | | | | | | | | Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-colli... | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | |/| | | | | | | | |||||
| | | * | | | | | | | | | | Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-legacy' into linux-legacy | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | | | Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / | | | | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / | | | | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / | | | | | |/| | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | | | Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|/ / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | | Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-docs' into linux-docs | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | | | | | | | | | Tag zfs-0.4.5 for real | Brian Behlendorf | 2009-08-04 | 1 | -3/+0 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'refs/top-bases/top' into top | Brian Behlendorf | 2009-08-04 | 6 | -135/+136 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch | Brian Behlendorf | 2009-08-04 | 6 | -135/+136 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 6 | -135/+136 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-08-04 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | |