summaryrefslogtreecommitdiffstats
path: root/module
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-11-201-1/+1
|\
| * Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-11-201-1/+1
| |\
| | * Merge branch 'gcc-uninit' into refs/top-bases/gcc-branchBrian Behlendorf2009-11-201-1/+1
| | |\
| | | * Prevent gcc uninit compiler warning in zfs_range_unlock_reader().Brian Behlendorf2009-11-201-1/+1
| | | * Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninitBrian Behlendorf2009-11-151-1835/+0
| | | |\
* | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-11-151-1835/+0
|\| | | |
| * | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-11-151-1835/+0
| |\| | |
| | * | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2009-11-151-1835/+0
| | |\ \ \
| | | * \ \ Merge commit 'refs/top-bases/gcc-c90' into gcc-c90Brian Behlendorf2009-11-151-1835/+0
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Remove zvol.c when updating in update-zfs.sh Linux version available.Brian Behlendorf2009-11-151-1835/+0
* | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-08-184-21/+28
|\| | | | |
| * | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-08-184-21/+28
| |\| | | |
| | * | | | Merge branch 'gcc-shadow' into refs/top-bases/gcc-branchBrian Behlendorf2009-08-181-14/+14
| | |\ \ \ \
| | | * | | | Required build 121 updates for gcc-shadowBrian Behlendorf2009-08-181-14/+14
| | | * | | | Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadowBrian Behlendorf2009-08-1851-716/+2581
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | * | | | Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadowBrian Behlendorf2009-07-0284-2359/+5385
| | | |\ \ \ \
| | | * \ \ \ \ Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadowBrian Behlendorf2009-02-1829-707/+1020
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadowBrian Behlendorf2009-01-1539-604/+1094
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadowBrian Behlendorf2009-01-054-0/+38476
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ Merge branch 'gcc-uninit' into refs/top-bases/gcc-branchBrian Behlendorf2009-08-181-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | * | | | | | | | Required build 121 updates for gcc-uninitBrian Behlendorf2009-08-181-1/+1
| | | * | | | | | | | Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninitBrian Behlendorf2009-08-1851-716/+2581
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / | | | | |/| | | | | |
| | * | | | | | | | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2009-08-183-6/+13
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | * | | | | | | | Required build 121 updates for gcc-c90Brian Behlendorf2009-08-183-6/+13
* | | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-08-1851-716/+2580
|\| | | | | | | | | |
| * | | | | | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-08-1851-716/+2580
| |\| | | | | | | | |
| | * | | | | | | | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2009-08-1851-716/+2580
| | |\| | | | | | | |
| | | * | | | | | | | Merge commit 'refs/top-bases/gcc-c90' into gcc-c90Brian Behlendorf2009-08-1851-717/+2581
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | | * | | | | | | Rebase master to b121Brian Behlendorf2009-08-1851-716/+2581
| | | | | |_|_|_|_|/ | | | | |/| | | | |
* | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-08-041-0/+4
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'feature-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-08-041-0/+4
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'feature-pthreads' into refs/top-bases/feature-branchBrian Behlendorf2009-08-041-0/+4
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Revert kthreads based on pthread thread specific data due to failure.Brian Behlendorf2009-08-041-0/+4
* | | | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-08-041-4/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'feature-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-08-041-4/+0
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge branch 'feature-pthreads' into refs/top-bases/feature-branchBrian Behlendorf2009-08-041-4/+0
| | |\| | | | | | | | |
| | | * | | | | | | | | Reimplement user kthreads based on pthread thread specific data.Ricardo M. Correia2009-08-041-4/+0
* | | | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-08-031-2/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-08-031-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch 'gcc-unused' into refs/top-bases/gcc-branchBrian Behlendorf2009-08-031-2/+1
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | refcount_add() mistakenly moved to ASSERT() breaks --disable-debug builds.Brian Behlendorf2009-08-031-2/+1
* | | | | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branchBrian Behlendorf2009-07-292-22/+30
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'fix-branch' into refs/top-bases/zfs-branchBrian Behlendorf2009-07-292-22/+30
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fix-stack' into refs/top-bases/fix-branchBrian Behlendorf2009-07-292-22/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Excessively large stack frames detected.Brian Behlendorf2009-07-292-22/+30
| | | * | | | | | | | | | | | Merge commit 'refs/top-bases/fix-stack' into fix-stackBrian Behlendorf2009-07-0684-2359/+5385
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | Merge commit 'refs/top-bases/fix-stack' into fix-stackBrian Behlendorf2009-02-1829-707/+1020
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | Merge commit 'refs/top-bases/fix-stack' into fix-stackBrian Behlendorf2009-01-1539-604/+1094
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | Merge commit 'refs/top-bases/fix-stack' into fix-stackBrian Behlendorf2009-01-054-0/+38476
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | Merge commit 'refs/top-bases/fix-stack' into fix-stackBrian Behlendorf2008-12-114-850/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \