Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch | Brian Behlendorf | 2009-07-14 | 1 | -6/+13 |
|\ | |||||
| * | Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-07-14 | 1 | -6/+13 |
| |\ | |||||
| | * | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-07-14 | 1 | -6/+13 |
| | |\ | |||||
| | | * | Merge branch 'feature-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-07-14 | 1 | -6/+13 |
| | | |\ | |||||
| | | | * | Provide correct kthread API semantics using pthreads. | Brian Behlendorf | 2009-07-14 | 1 | -6/+13 |
* | | | | | Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch | Brian Behlendorf | 2009-07-09 | 1 | -1/+1 |
|\| | | | | |||||
| * | | | | Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-07-09 | 1 | -1/+1 |
| |\| | | | |||||
| | * | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-07-09 | 1 | -1/+1 |
| | |\| | | |||||
| | | * | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-07-09 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | | * \ | Merge branch 'gcc-unused' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-07-09 | 1 | -1/+1 |
| | | | |\ \ | |||||
| | | | | * | | Revert to original debugging code and wrap any variabled used only | Brian Behlendorf | 2009-07-09 | 1 | -1/+1 |
* | | | | | | | Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch | Brian Behlendorf | 2009-07-08 | 1 | -3/+3 |
|\| | | | | | | |||||
| * | | | | | | Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-07-08 | 1 | -3/+3 |
| |\| | | | | | |||||
| | * | | | | | Untracked pthread changes which must have accidentally crept in. | Brian Behlendorf | 2009-07-08 | 1 | -3/+3 |
* | | | | | | | Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch | Brian Behlendorf | 2009-07-08 | 1 | -61/+62 |
|\| | | | | | | |||||
| * | | | | | | Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-07-08 | 1 | -61/+62 |
| |\| | | | | | |||||
| | * | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-07-08 | 1 | -61/+62 |
| | |\| | | | | |||||
| | | * | | | | Merge branch 'feature-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-07-08 | 1 | -61/+62 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | | | * | | | Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads | Brian Behlendorf | 2009-07-08 | 1 | -2/+2 |
| | | | |\ \ \ | |||||
| | | | | * | | | Add new DMU_READ_PREFETCH flag to dmu_read(). | Brian Behlendorf | 2009-07-08 | 1 | -2/+2 |
| | | | * | | | | Stop the kthread/thread/pthread mixing and matching insanity. Update all | Brian Behlendorf | 2009-07-08 | 1 | -59/+60 |
* | | | | | | | | Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch | Brian Behlendorf | 2009-07-08 | 2 | -12/+24 |
|\| | | | | | | | |||||
| * | | | | | | | Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-07-08 | 2 | -12/+24 |
| |\| | | | | | | |||||
| | * | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-07-08 | 2 | -12/+24 |
| | |\| | | | | | |||||
| | | * | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-07-08 | 2 | -12/+24 |
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | | | |||||
| | | | * | | | | Merge branch 'gcc-cast' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-07-08 | 2 | -11/+21 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | Add explicit casts for (u_longlong_t) when printing uint64_t. | Brian Behlendorf | 2009-07-08 | 1 | -10/+20 |
| | | | | * | | | | Add explicit casts for (u_longlong_t) when printing uint64_t. | Brian Behlendorf | 2009-07-08 | 1 | -1/+1 |
| | | | | * | | | | Merge commit 'refs/top-bases/gcc-cast' into gcc-cast | Brian Behlendorf | 2009-07-02 | 8 | -747/+1331 |
| | | | | |\ \ \ \ | | | | | | | |_|/ | | | | | | |/| | | |||||
| | | | * | | | | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-07-08 | 1 | -1/+3 |
| | | | |\ \ \ \ \ | |||||
| | | | | * | | | | | Resolve a 2 new cases of for loop variable declared in for() | Brian Behlendorf | 2009-07-08 | 1 | -1/+3 |
* | | | | | | | | | | Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch | Brian Behlendorf | 2009-07-06 | 1 | -1/+6 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-07-06 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Update to use dmu_read() instead of dmu_read_impl() now that a 'flags' | Brian Behlendorf | 2009-07-06 | 1 | -1/+6 |
| | * | | | | | | | | | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-07-06 | 1 | -9/+9 |
| | |\| | | | | | | | | |||||
| | * | | | | | | | | | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-07-06 | 8 | -749/+1333 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-05-22 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-03-20 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-03-19 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-03-19 | 3 | -59/+280 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-03-19 | 3 | -59/+59 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-03-18 | 1 | -3/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-03-16 | 1 | -27/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-03-12 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-03-12 | 5 | -5/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-03-12 | 1 | -0/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-03-12 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch | Brian Behlendorf | 2009-07-06 | 1 | -9/+9 |
|\| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-07-06 | 1 | -9/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-07-06 | 1 | -9/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | / / / / / / / | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |