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

2007 Commits

Author SHA1 Message Date
Brian Behlendorf 6fe19bd252 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 
Conflicts:

	lib/libzpool/kernel.c
	module/zfs/arc.c
 2009-02-18 14:28:15 -08:00
Brian Behlendorf 3ac1fca8dc Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2009-02-18 14:27:31 -08:00
Brian Behlendorf f0a8aedfbc Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 
Conflicts:

	lib/libzpool/kernel.c
	module/zfs/arc.c
 2009-02-18 14:27:12 -08:00
Brian Behlendorf 9d88c314ef Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-02-18 14:04:10 -08:00
Brian Behlendorf eb387a3281 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2009-02-18 14:04:09 -08:00
Brian Behlendorf 3eb7fa9afd Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow 2009-02-18 14:04:08 -08:00
Brian Behlendorf c694a929cf Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2009-02-18 14:04:05 -08:00
Brian Behlendorf 32d4d74b04 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2009-02-18 14:04:04 -08:00
Brian Behlendorf 6fa66816c1 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 
Conflicts:

	module/zfs/arc.c
 2009-02-18 14:03:55 -08:00
Brian Behlendorf 5be9e325a1 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 
Conflicts:

	module/zfs/arc.c
 2009-02-18 14:03:22 -08:00
Brian Behlendorf 9a160959b6 Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2009-02-18 13:12:59 -08:00
Brian Behlendorf ba528721da Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2009-02-18 13:12:58 -08:00
Brian Behlendorf b0c6d9452e Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2009-02-18 13:12:55 -08:00
Brian Behlendorf 0b8e48b813 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2009-02-18 13:12:53 -08:00
Brian Behlendorf f499f3e5f4 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2009-02-18 13:12:49 -08:00
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 699ee2d085 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-02-06 15:02:19 -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 e098151299 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-02-06 11:51:46 -08:00
Brian Behlendorf 97e40aae09 Add 8 basic x4550 configurations which are of interest. 2009-02-06 11:47:09 -08:00
Brian Behlendorf eee789700c Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-02-05 15:22:50 -08:00
Brian Behlendorf 6c863d6aa1 Prep for zfs-0.4.2 tag 2009-02-05 15:19:27 -08:00
Brian Behlendorf 7a16be7088 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-02-04 16:32:01 -08:00
Brian Behlendorf 83ed5b4c5d Update TODO 2009-02-04 16:25:09 -08:00
Brian Behlendorf e2151bd1cb Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-02-03 10:03:16 -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 a58aa8cf29 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-01-26 22:10:53 -08:00
Brian Behlendorf 442ffc3574 Update bug assert in TODO 2009-01-26 22:07:34 -08:00
Brian Behlendorf 5605607237 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-01-26 22:02:34 -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