Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-01-15 | 2 | -11/+0 |
|\ | |||||
| * | Merge branch 'fix-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-01-15 | 2 | -11/+0 |
| |\ | |||||
| | * | Merge branch 'fix-locks' into refs/top-bases/fix-branch | Brian Behlendorf | 2009-01-15 | 2 | -11/+0 |
| | |\ | |||||
| | | * | All init and destroy initialized pulled in | Brian Behlendorf | 2009-01-15 | 1 | -3/+0 |
| | | * | txg_init/txg_fini cv_* initialized pulled in upstream in a slightly different... | Brian Behlendorf | 2009-01-15 | 1 | -8/+0 |
| | | * | Resolve conflict with removed cleaner type | Brian Behlendorf | 2009-01-15 | 38 | -604/+1084 |
| | | |\ | |||||
| | | * \ | Merge commit 'refs/top-bases/fix-locks' into fix-locks | Brian Behlendorf | 2009-01-05 | 4 | -0/+38476 |
| | | |\ \ | |||||
| | | * \ \ | Merge commit 'refs/top-bases/fix-locks' into fix-locks | Brian Behlendorf | 2008-12-11 | 4 | -850/+0 |
| | | |\ \ \ | |||||
| | | * | | | | Merge commit 'refs/top-bases/fix-locks' into fix-locks | Brian Behlendorf | 2008-12-11 | 4 | -0/+21 |
| | * | | | | | Resolve conflict with removed cleaner type | Brian Behlendorf | 2009-01-15 | 38 | -604/+1084 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap | Brian Behlendorf | 2009-01-15 | 39 | -604/+1094 |
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | |||||
* | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-01-15 | 1 | -1/+1 |
|\| | | | | | | | |||||
| * | | | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-01-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'gcc-c90' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-01-15 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Resolve C90 int declared in for() construct | Brian Behlendorf | 2009-01-15 | 1 | -1/+1 |
* | | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-01-15 | 1 | -8/+12 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-01-15 | 1 | -8/+12 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-01-15 | 1 | -8/+12 |
| | |\| | | | | | | | |||||
| | | * | | | | | | | Resolve C90 int declared in for() construct | Brian Behlendorf | 2009-01-15 | 1 | -8/+12 |
* | | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-01-15 | 1 | -3/+6 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-01-15 | 1 | -3/+6 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-01-15 | 1 | -3/+6 |
| | |\| | | | | | | | |||||
| | | * | | | | | | | Resolve C90 int declared in for() construct | Brian Behlendorf | 2009-01-15 | 1 | -3/+6 |
* | | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-01-15 | 1 | -1/+2 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-01-15 | 1 | -1/+2 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-01-15 | 1 | -1/+2 |
| | |\| | | | | | | | |||||
| | | * | | | | | | | Resolve C90 int declared in for() construct | Brian Behlendorf | 2009-01-15 | 1 | -1/+2 |
* | | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-01-15 | 38 | -604/+1084 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Resolve conflict with removed cleaner type | Brian Behlendorf | 2009-01-15 | 38 | -604/+1084 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | Resolve conflict with removed cleaner type | Brian Behlendorf | 2009-01-15 | 39 | -604/+1094 |
| | |\| | | | | | | | |||||
| | | * | | | | | | | Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 | Brian Behlendorf | 2009-01-15 | 39 | -604/+1094 |
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | | | |||||
| | | | * | | | | | | Rebase master to b105 | Brian Behlendorf | 2009-01-15 | 39 | -604/+1094 |
| | | | | |_|_|_|/ | | | | |/| | | | | |||||
* | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-01-13 | 1 | -0/+2 |
|\| | | | | | | | | |||||
| * | | | | | | | | Merge branch 'fix-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-01-13 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||||
| | * | | | | | | | Merge branch 'fix-list' into refs/top-bases/fix-branch | Brian Behlendorf | 2009-01-13 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Initialize list links | Brian Behlendorf | 2009-01-13 | 1 | -0/+2 |
* | | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-01-13 | 3 | -0/+5 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'fix-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-01-13 | 3 | -0/+5 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'fix-list' into refs/top-bases/fix-branch | Brian Behlendorf | 2009-01-13 | 3 | -0/+5 |
| | |\| | | | | | | | |||||
| | | * | | | | | | | Fix proper list node initialization | Brian Behlendorf | 2009-01-13 | 3 | -0/+5 |
* | | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-01-13 | 1 | -1/+1 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'fix-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-01-13 | 1 | -1/+1 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch | Brian Behlendorf | 2009-01-13 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Additional rw_lock not being initialized cleaned in updated code | Brian Behlendorf | 2009-01-13 | 1 | -1/+1 |
| | | * | | | | | | | | Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks | Brian Behlendorf | 2009-01-05 | 4 | -0/+38476 |
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / | | | | |/| | | | | | | |||||
| | | * | | | | | | | | Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks | Brian Behlendorf | 2008-12-11 | 4 | -850/+0 |
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ | | | | |/| | | | | | | |||||
| | | * | | | | | | | | Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks | Brian Behlendorf | 2008-12-11 | 2 | -3/+3 |
| | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
* | | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-01-13 | 3 | -3/+8 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'fix-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-01-13 | 3 | -3/+8 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'fix-list' into refs/top-bases/fix-branch | Brian Behlendorf | 2009-01-13 | 3 | -3/+8 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | | |