Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-03-11 | 1 | -1/+2 |
|\ | |||||
| * | Merge commit 'refs/top-bases/linux-arc' into linux-arc | Brian Behlendorf | 2009-03-11 | 1 | -1/+2 |
| |\ | |||||
| | * | Remove -Wno-unknown-pragmas compile option, all unknown pragmas | Brian Behlendorf | 2009-03-11 | 1 | -1/+2 |
* | | | Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-03-11 | 1 | -1/+1 |
|\| | | |||||
| * | | Merge commit 'refs/top-bases/linux-arc' into linux-arc | Brian Behlendorf | 2009-03-11 | 1 | -1/+1 |
| |\| | |||||
| | * | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-03-11 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-03-11 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-03-11 | 1 | -1/+1 |
| | | | |\ | |||||
| | | | | * | Ensure idx is properly initialized in all instances. | Brian Behlendorf | 2009-03-11 | 1 | -1/+1 |
* | | | | | | Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-03-11 | 65 | -68/+62 |
|\| | | | | | |||||
| * | | | | | Merge commit 'refs/top-bases/linux-arc' into linux-arc | Brian Behlendorf | 2009-03-11 | 65 | -65/+65 |
| |\| | | | | |||||
| | * | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-03-11 | 65 | -65/+65 |
| | |\| | | | |||||
| | | * | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-03-11 | 65 | -65/+65 |
| | | |\| | | |||||
| | | | * | | Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-03-11 | 65 | -65/+65 |
| | | | |\ \ | |||||
| | | | | * | | Added 'gcc-ident-pragmas' branch. | Ricardo M. Correia | 2009-03-11 | 65 | -65/+65 |
* | | | | | | | Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-03-11 | 1 | -11/+11 |
|\| | | | | | | |||||
| * | | | | | | Merge commit 'refs/top-bases/linux-arc' into linux-arc | Brian Behlendorf | 2009-03-11 | 1 | -11/+11 |
| |\| | | | | | |||||
| | * | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-03-11 | 1 | -11/+11 |
| | |\| | | | | |||||
| | | * | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-03-11 | 1 | -11/+11 |
| | | |\| | | | |||||
| | | | * | | | Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch | Brian Behlendorf | 2009-03-11 | 1 | -11/+11 |
| | | | |\ \ \ | |||||
| | | | | * | | | Add 'ull' suffix to 64-bit constants. | Ricardo M. Correia | 2009-03-11 | 1 | -11/+11 |
| | | | | |/ / | |||||
* | | | | | | | Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-03-10 | 3 | -4/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Build system and packaging (RPM support) (Part 3) | Brian Behlendorf | 2009-03-10 | 3 | -4/+1 |
| * | | | | | | | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-03-10 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-03-10 | 17 | -48/+29 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-03-10 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge commit 'refs/top-bases/linux-arc' into linux-arc | Brian Behlendorf | 2009-03-10 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| | * | | | | | | | zpios subdir should be on linux-zpios branch | Brian Behlendorf | 2009-03-10 | 1 | -1/+0 |
| | | |/ / / / / | | |/| | | | | | |||||
* | | | | | | | | Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-03-10 | 17 | -48/+29 |
|\| | | | | | | | |||||
| * | | | | | | | Merge commit 'refs/top-bases/linux-arc' into linux-arc | Brian Behlendorf | 2009-03-10 | 17 | -48/+29 |
| |\| | | | | | | |||||
| | * | | | | | | Build system and packaging (RPM support) (Part 2) | Brian Behlendorf | 2009-03-10 | 17 | -48/+29 |
* | | | | | | | | Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-02-20 | 2 | -16/+26 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Update profile scripts with additional upcalls for fine grained profiling | Brian Behlendorf | 2009-02-20 | 2 | -16/+26 |
* | | | | | | | | Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-02-19 | 1 | -65/+59 |
|\| | | | | | | | |||||
| * | | | | | | | Remove useless run_args->regions check which was always true | Brian Behlendorf | 2009-02-19 | 1 | -65/+59 |
* | | | | | | | | Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-02-19 | 2 | -21/+24 |
|\| | | | | | | | |||||
| * | | | | | | | Minor zpios cleanup plus addition of --nowait feature | Brian Behlendorf | 2009-02-19 | 2 | -21/+24 |
| * | | | | | | | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-02-18 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-02-18 | 1 | -9/+9 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-02-18 | 29 | -708/+1021 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-01-15 | 2 | -11/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-01-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-01-15 | 1 | -8/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-01-15 | 1 | -3/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-01-15 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'refs/top-bases/linux-zpios' into linux-zpios | Brian Behlendorf | 2009-01-15 | 38 | -604/+1084 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch | Brian Behlendorf | 2009-02-18 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge commit 'refs/top-bases/linux-arc' into linux-arc | Brian Behlendorf | 2009-02-18 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge commit 'refs/top-bases/zfs-branch' into zfs-branch | Brian Behlendorf | 2009-02-18 | 1 | -2/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | / / / / | | | | |_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Merge branch 'gcc-branch' into refs/top-bases/zfs-branch | Brian Behlendorf | 2009-02-18 | 1 | -2/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | |