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

193 Commits

Author SHA1 Message Date
Brian Behlendorf 34f01d7e28 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-11 14:12:00 -07:00
Brian Behlendorf 1ca6578ebc Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 14:08:51 -07:00
Brian Behlendorf 8a3b1a5ff5 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 14:08:50 -07:00
Brian Behlendorf e5011401cd Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2009-03-11 14:08:48 -07:00
Brian Behlendorf 3226eea157 Resolve additional cases where gcc wants extra parenthesis. 
These were introduced by the rebase to b108.
 2009-03-11 13:57:47 -07:00
Brian Behlendorf 1c8bbc5fd9 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-11 11:19:10 -07:00
Brian Behlendorf dff484a388 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 11:09:13 -07:00
Brian Behlendorf 5f30a3cb0e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 11:09:11 -07:00
Brian Behlendorf 8fe801fd8f Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2009-03-11 11:00:42 -07:00
Ricardo M. Correia af45030850 Added 'gcc-ident-pragmas' branch. 2009-03-11 10:59:45 -07:00
Brian Behlendorf 88f71167ae Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-10 21:28:14 -07:00
Brian Behlendorf c8e569dd1c Build system and packaging (RPM support) (Part 2) 
Complete support for dist install srpm and rpm make targets.
 2009-03-10 21:13:30 -07:00
Brian Behlendorf 64cf713c65 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-02-18 15:22:38 -08:00
Brian Behlendorf 830ac5b109 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-02-18 15:20:11 -08:00
Brian Behlendorf 6f8f3b5532 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-02-18 15:20:10 -08:00
Brian Behlendorf 9d4d22a26e Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-02-18 15:20:08 -08:00
Brian Behlendorf 8c228734a3 Fix cast 2009-02-18 15:15:56 -08:00
Brian Behlendorf ba8fc98d00 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-02-18 14:36:04 -08:00
Brian Behlendorf 7872d84be6 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-02-18 14:30:54 -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 ba528721da Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2009-02-18 13:12:58 -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 594ce22168 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-15 14:21:30 -08:00
Brian Behlendorf ddaad20220 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 14:16:23 -08:00
Brian Behlendorf da7151a89e Resolve conflict with removed cleaner type 2009-01-15 14:11:19 -08:00
Brian Behlendorf 2f36bf5af4 Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2009-01-15 14:05:29 -08:00
Brian Behlendorf a2e601c6e3 Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2009-01-15 14:04:39 -08:00
Brian Behlendorf 3fa768e21b Resolve conflict with removed cleaner type 2009-01-15 14:04:35 -08:00
Brian Behlendorf d3df6b2012 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2009-01-15 14:01:51 -08:00
Brian Behlendorf fb5f0bc833 Rebase master to b105 2009-01-15 13:59:39 -08:00
Brian Behlendorf 1fd9167bc0 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-09 15:11:25 -08:00
Brian Behlendorf 6791a1ee34 I don't think we need this in userspace 2009-01-09 15:07:32 -08:00
Brian Behlendorf 0f48a52f65 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-09 14:46:10 -08:00
Brian Behlendorf ff09d64647 Pull all source in to be built, it will be ifdef'ed out as need by higher level topic branches 2009-01-09 14:37:45 -08:00
Brian Behlendorf 9d335bca85 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-08 10:28:47 -08:00
Brian Behlendorf b457fb49f9 Remove vdev_disk from userspace build, vdev_file is used 2009-01-08 10:23:59 -08:00
Brian Behlendorf 97dab5053e Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-05 13:46:59 -08:00
Brian Behlendorf c15fa0ceb0 Add include paths 2009-01-05 13:44:26 -08:00
Brian Behlendorf 9c73332e81 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-05 12:41:15 -08:00
Brian Behlendorf ce7115b807 Add unicode makefile references and support 2009-01-05 12:33:09 -08:00
Brian Behlendorf ced77c2f1b Add unicode makefile references and support 2009-01-05 12:32:55 -08:00
Brian Behlendorf 86efe1f206 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-22 14:45:09 -08:00
Brian Behlendorf 29b47d366e Remove some headers 2008-12-22 14:42:02 -08:00
Brian Behlendorf 6157e981b3 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-22 13:52:26 -08:00
Brian Behlendorf 90e5216ea9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 13:51:17 -08:00
Brian Behlendorf 035e4d373e Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-22 13:51:16 -08:00
Brian Behlendorf c9597f9a4f Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-22 13:51:15 -08:00