Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity
2,145 Commits 42 Branches 132 Tags 226 MiB
Commit Graph

2145 Commits

Author SHA1 Message Date
Brian Behlendorf fc8954db24 Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2009-02-18 13:12:48 -08:00
Brian Behlendorf 6d44b6b1da Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2009-02-18 13:12:45 -08:00
Brian Behlendorf 345705bdd4 Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2009-02-18 13:12:44 -08:00
Brian Behlendorf f97b1ae20f Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2009-02-18 13:12:41 -08:00
Brian Behlendorf e7722c9f51 Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2009-02-18 13:12:40 -08:00
Brian Behlendorf f19f346366 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-02-18 13:12:36 -08:00
Brian Behlendorf e203e7b48f Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2009-02-18 13:12:35 -08:00
Brian Behlendorf f686a87058 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 
Conflicts:

	module/zfs/arc.c
 2009-02-18 13:12:26 -08:00
Brian Behlendorf 3b17164f71 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 
Conflicts:

	module/zfs/vdev.c
	module/zfs/zio.c
 2009-02-18 13:09:32 -08:00
Brian Behlendorf d164b20935 Rebase master to b108 2009-02-18 12:51:31 -08:00
Brian Behlendorf 4e4327a0a5 Drop the KERNEL portion of this check, just checking __i386 is correct 2009-02-07 13:10:16 -08:00
Brian Behlendorf 13e2e85354 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-02-06 15:01:00 -08:00
Brian Behlendorf 3c9fa95530 Add 2 new args for zpool_create to take extra args 2009-02-06 14:57:37 -08:00
Brian Behlendorf 001a164556 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-02-06 11:50:26 -08:00
Brian Behlendorf 97e40aae09 Add 8 basic x4550 configurations which are of interest. 2009-02-06 11:47:09 -08:00
Brian Behlendorf c3ec929baf Ensure vmem_size() calculations are only used on __i386 or we will 
missize the arch cache on 64bit machines with the SPL.  This change
should probably be there in the Solaris version as well.
 2009-02-06 10:09:20 -08:00
Brian Behlendorf 95790e35ce Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-02-05 15:21:33 -08:00
Brian Behlendorf 6c863d6aa1 Prep for zfs-0.4.2 tag 2009-02-05 15:19:27 -08:00
Brian Behlendorf 1cc865f9b4 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-02-04 16:29:32 -08:00
Brian Behlendorf 83ed5b4c5d Update TODO 2009-02-04 16:25:09 -08:00
Brian Behlendorf 770152bd1d Revert current code removal changes, this support now exists in the SPL. The branch is being left in place because I expect there to be other new changes soon 2009-02-04 15:19:19 -08:00
Brian Behlendorf 066580cffa Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-02-03 10:02:01 -08:00
Brian Behlendorf 4365c44425 Properly detect and set HAVE_GPL_ONLY_SYMBOLS based on license 2009-02-03 09:59:54 -08:00
Brian Behlendorf 84c7147835 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-26 22:09:38 -08:00
Brian Behlendorf 442ffc3574 Update bug assert in TODO 2009-01-26 22:07:34 -08:00
Brian Behlendorf 6660f34311 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-26 22:01:18 -08:00
Brian Behlendorf 3417d4db34 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-26 22:01:17 -08:00
Brian Behlendorf cd2a009e7c Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-01-26 22:01:16 -08:00
Brian Behlendorf 55d5d578e7 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2009-01-26 22:01:15 -08:00
Brian Behlendorf 16ef710f59 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2009-01-26 22:01:15 -08:00
Brian Behlendorf 3bac1c60c0 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2009-01-26 22:01:15 -08:00
Brian Behlendorf fc9ccdaa2e Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-26 22:01:13 -08:00
Brian Behlendorf 626939c8f1 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-01-26 22:01:12 -08:00
Brian Behlendorf 3d8d90cabd Merge commit 'refs/top-bases/fix-list' into fix-list 2009-01-26 22:01:12 -08:00
Brian Behlendorf 1bc61f560c Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-26 22:01:12 -08:00
Brian Behlendorf bd1377acda Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2009-01-26 22:01:11 -08:00
Brian Behlendorf ab471b80aa Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2009-01-26 22:01:10 -08:00
Brian Behlendorf 8c29491191 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2009-01-26 22:01:09 -08:00
Brian Behlendorf 9adbf76871 Merge branch 'fix-stack' into refs/top-bases/fix-branch 2009-01-26 22:01:09 -08:00
Brian Behlendorf 5f8aaed66f Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2009-01-26 22:01:08 -08:00
Brian Behlendorf 7cce398964 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2009-01-26 22:01:07 -08:00
Brian Behlendorf 542b40d70a Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads 2009-01-26 22:01:06 -08:00
Brian Behlendorf 08467909fd Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2009-01-26 22:01:06 -08:00
Brian Behlendorf cafee35f65 Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2009-01-26 22:01:05 -08:00
Brian Behlendorf e99b74eab4 Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch 2009-01-26 22:01:05 -08:00
Brian Behlendorf befef7b7f9 Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2009-01-26 22:01:04 -08:00
Brian Behlendorf 3b37c2c237 Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2009-01-26 22:01:03 -08:00
Brian Behlendorf e0a3fdfaab Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2009-01-26 22:01:02 -08:00
Brian Behlendorf 589e75fda4 Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2009-01-26 22:01:02 -08:00
Brian Behlendorf 2aed3d7b15 Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2009-01-26 22:01:01 -08:00