Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-11-20 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-11-20 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-11-20 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Prevent gcc uninit compiler warning in zfs_range_unlock_reader(). | Brian Behlendorf | 2009-11-20 | 1 | -1/+1 |
| | | * | Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit | Brian Behlendorf | 2009-11-15 | 1 | -1835/+0 |
| | | |\ | |||||
* | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-11-15 | 1 | -1835/+0 |
|\| | | | | |||||
| * | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-11-15 | 1 | -1835/+0 |
| |\| | | | |||||
| | * | | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-11-15 | 1 | -1835/+0 |
| | |\ \ \ | |||||
| | | * \ \ | Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 | Brian Behlendorf | 2009-11-15 | 1 | -1835/+0 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | Remove zvol.c when updating in update-zfs.sh Linux version available. | Brian Behlendorf | 2009-11-15 | 1 | -1835/+0 |
* | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-08-18 | 4 | -21/+28 |
|\| | | | | | |||||
| * | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-08-18 | 4 | -21/+28 |
| |\| | | | | |||||
| | * | | | | Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-08-18 | 1 | -14/+14 |
| | |\ \ \ \ | |||||
| | | * | | | | Required build 121 updates for gcc-shadow | Brian Behlendorf | 2009-08-18 | 1 | -14/+14 |
| | | * | | | | Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow | Brian Behlendorf | 2009-08-18 | 46 | -711/+2553 |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | |||||
| | | * | | | | Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow | Brian Behlendorf | 2009-07-02 | 75 | -2305/+5278 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow | Brian Behlendorf | 2009-02-18 | 29 | -707/+1020 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow | Brian Behlendorf | 2009-01-15 | 39 | -604/+1094 |
| | | |\ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ | Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-08-18 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
| | | * | | | | | | | Required build 121 updates for gcc-uninit | Brian Behlendorf | 2009-08-18 | 1 | -1/+1 |
| | | * | | | | | | | Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit | Brian Behlendorf | 2009-08-18 | 46 | -711/+2553 |
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | | | |||||
| | * | | | | | | | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-08-18 | 3 | -6/+13 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
| | | * | | | | | | | Required build 121 updates for gcc-c90 | Brian Behlendorf | 2009-08-18 | 3 | -6/+13 |
* | | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-08-18 | 46 | -711/+2552 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-08-18 | 46 | -711/+2552 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-08-18 | 46 | -711/+2552 |
| | |\| | | | | | | | |||||
| | | * | | | | | | | Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 | Brian Behlendorf | 2009-08-18 | 46 | -712/+2553 |
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | |||||
| | | | * | | | | | | Rebase master to b121 | Brian Behlendorf | 2009-08-18 | 46 | -711/+2553 |
| | | | | |_|_|_|/ | | | | |/| | | | | |||||
* | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-08-04 | 1 | -0/+4 |
|\| | | | | | | | | |||||
| * | | | | | | | | Merge branch 'feature-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-08-04 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'feature-pthreads' into refs/top-bases/feature-branch | Brian Behlendorf | 2009-08-04 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Revert kthreads based on pthread thread specific data due to failure. | Brian Behlendorf | 2009-08-04 | 1 | -0/+4 |
* | | | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-08-04 | 1 | -4/+0 |
|\| | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'feature-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-08-04 | 1 | -4/+0 |
| |\| | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'feature-pthreads' into refs/top-bases/feature-branch | Brian Behlendorf | 2009-08-04 | 1 | -4/+0 |
| | |\| | | | | | | | | |||||
| | | * | | | | | | | | Reimplement user kthreads based on pthread thread specific data. | Ricardo M. Correia | 2009-08-04 | 1 | -4/+0 |
* | | | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-08-03 | 1 | -2/+1 |
|\| | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-08-03 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'gcc-unused' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-08-03 | 1 | -2/+1 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | refcount_add() mistakenly moved to ASSERT() breaks --disable-debug builds. | Brian Behlendorf | 2009-08-03 | 1 | -2/+1 |
* | | | | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-07-29 | 2 | -22/+30 |
|\| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'fix-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-07-29 | 2 | -22/+30 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'fix-stack' into refs/top-bases/fix-branch | Brian Behlendorf | 2009-07-29 | 2 | -22/+30 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | Excessively large stack frames detected. | Brian Behlendorf | 2009-07-29 | 2 | -22/+30 |
| | | * | | | | | | | | | | | Merge commit 'refs/top-bases/fix-stack' into fix-stack | Brian Behlendorf | 2009-07-06 | 75 | -2305/+5278 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | | Merge commit 'refs/top-bases/fix-stack' into fix-stack | Brian Behlendorf | 2009-02-18 | 29 | -707/+1020 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | | Merge commit 'refs/top-bases/fix-stack' into fix-stack | Brian Behlendorf | 2009-01-15 | 39 | -604/+1094 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | | Merge commit 'refs/top-bases/fix-stack' into fix-stack | Brian Behlendorf | 2008-12-11 | 1 | -2/+10 |
| | * | | | | | | | | | | | | Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch | Brian Behlendorf | 2009-07-06 | 75 | -2310/+5278 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap | Brian Behlendorf | 2009-07-06 | 75 | -2305/+5278 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / | | | | |/| | | | | | | | | | |