Commit Graph

404 Commits

Author SHA1 Message Date
Brian Behlendorf a43838cc7c Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-03-11 21:00:45 -07:00
Brian Behlendorf 4c042de40b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 20:59:43 -07:00
Brian Behlendorf 60ac8152fe Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 20:59:42 -07:00
Brian Behlendorf 9915249546 Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2009-03-11 20:53:11 -07:00
Brian Behlendorf d4dbc7dca8 Resolve all instances of missing braces. 2009-03-11 20:52:21 -07:00
Brian Behlendorf 534aba2478 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-03-11 14:10:15 -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 6a721fa85b Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-03-11 13:25:02 -07:00
Brian Behlendorf 4e945fb768 Remove -Wno-unknown-pragmas compile option, all unknown pragmas
have been removed by the gcc-ident-pragmas topic branch.
2009-03-11 13:14:08 -07:00
Brian Behlendorf 9317ab431c Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-03-11 12:44:52 -07:00
Brian Behlendorf 0cad1eaf40 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 12:43:30 -07:00
Brian Behlendorf 86baaa124e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 12:43:29 -07:00
Brian Behlendorf ced9992186 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-03-11 12:43:28 -07:00
Brian Behlendorf fbb2843086 Ensure idx is properly initialized in all instances. 2009-03-11 12:34:24 -07:00
Brian Behlendorf 9d1e987b15 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-03-11 11:16:32 -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 9dca58253e Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-03-11 10:41:48 -07:00
Brian Behlendorf 8eaf19dae8 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 10:40:33 -07:00
Brian Behlendorf d43e9ca262 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 10:40:31 -07:00
Brian Behlendorf d641369d38 Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch 2009-03-11 10:32:45 -07:00
Ricardo M. Correia fd9a7a0fb4 Add 'ull' suffix to 64-bit constants. 2009-03-11 10:31:24 -07:00
Brian Behlendorf f4d54c5729 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-03-10 21:40:03 -07:00
Brian Behlendorf 4911b7be4d zpios subdir should be on linux-zpios branch 2009-03-10 21:33:24 -07:00
Brian Behlendorf 4dc5121c0d Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-03-10 21:26:39 -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 a922810637 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-02-18 16:37:35 -08:00
Brian Behlendorf b57a283336 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-02-18 16:36:19 -08:00
Brian Behlendorf d53b9a34ea Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-02-18 16:36:17 -08:00
Brian Behlendorf e6c50e7136 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-02-18 16:36:16 -08:00
Brian Behlendorf a0ef7f5826 C90 fixes int declared in for() is a C99 construct 2009-02-18 16:30:01 -08:00
Brian Behlendorf c743ea48a7 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-02-18 16:21:43 -08:00
Brian Behlendorf 6c4c486b9e Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-02-18 16:20:33 -08:00
Brian Behlendorf c1d525d6e9 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-02-18 16:20:32 -08:00
Brian Behlendorf fd9fdb78c6 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-02-18 16:20:30 -08:00
Brian Behlendorf f07954ef8a Pass 0's instead of NULL's which are the same but of the correct type 2009-02-18 16:14:20 -08:00
Brian Behlendorf eb3d5e7051 Local try should be in this patch 2009-02-18 14:47:06 -08:00
Brian Behlendorf f90944a9f0 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-02-18 14:34:25 -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 87307ab12a Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2009-02-18 14:30:48 -08:00
Brian Behlendorf dbc3a5ec55 Merge commit 'refs/top-bases/fix-list' into fix-list
Conflicts:

	module/zfs/arc.c
2009-02-18 14:29:48 -08:00
Brian Behlendorf 404fd8578f Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2009-02-18 14:28:27 -08:00
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 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 ba528721da Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2009-02-18 13:12:58 -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 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 42033b5a29 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-15 16:31:51 -08:00
Brian Behlendorf fb256294c9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 16:30:29 -08:00
Brian Behlendorf c5b335f613 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-15 16:30:28 -08:00
Brian Behlendorf 31cddc8a0b Merge branch 'fix-locks' into refs/top-bases/fix-branch 2009-01-15 16:30:25 -08:00
Brian Behlendorf 50186c2b57 All init and destroy initialized pulled in 2009-01-15 16:25:25 -08:00
Brian Behlendorf 7d4fe54632 txg_init/txg_fini cv_* initialized pulled in upstream in a slightly different way, drop these now redundant versions 2009-01-15 16:22:23 -08:00
Brian Behlendorf 1f4b4284c9 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-15 15:29:47 -08:00
Brian Behlendorf 8511545409 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 15:29:15 -08:00
Brian Behlendorf fa36244fba Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-15 15:29:14 -08:00
Brian Behlendorf 4c0be07ad9 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-15 15:29:13 -08:00
Brian Behlendorf 22284754e0 Resolve C90 int declared in for() construct 2009-01-15 15:26:54 -08:00
Brian Behlendorf 5894d8218f Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-15 14:52:39 -08:00
Brian Behlendorf 63722ea81a Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 14:52:04 -08:00
Brian Behlendorf 12fb73609c Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-15 14:52:04 -08:00
Brian Behlendorf e23dbee181 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-15 14:52:03 -08:00
Brian Behlendorf b61295bfb6 Resolve C90 int declared in for() construct 2009-01-15 14:49:42 -08:00
Brian Behlendorf 4935fd4f16 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-15 14:39:10 -08:00
Brian Behlendorf 3b6c91ec9f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 14:38:38 -08:00
Brian Behlendorf ec41b57eb3 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-15 14:38:38 -08:00
Brian Behlendorf e9c7a643f1 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-15 14:38:37 -08:00
Brian Behlendorf 77f365172c Resolve C90 int declared in for() construct 2009-01-15 14:36:27 -08:00
Brian Behlendorf a9fb75fc17 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-15 14:29:42 -08:00
Brian Behlendorf cb55f9a832 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 14:29:11 -08:00
Brian Behlendorf 43b4c537eb Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-15 14:29:10 -08:00
Brian Behlendorf f969333c73 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-15 14:29:09 -08:00
Brian Behlendorf c4fc002c87 Resolve C90 int declared in for() construct 2009-01-15 14:26:52 -08:00
Brian Behlendorf 4ceec4a504 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-15 14:19:18 -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 27cf20b0d6 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2009-01-15 14:16:19 -08:00
Brian Behlendorf 625451acfc Merge commit 'refs/top-bases/fix-list' into fix-list 2009-01-15 14:16:14 -08:00
Brian Behlendorf 089836c3e4 Resolve conflict with removed cleaner type 2009-01-15 14:14:57 -08:00
Brian Behlendorf 216ce72418 Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2009-01-15 14:13:46 -08:00
Brian Behlendorf 551838a6c8 Resolve conflict with removed cleaner type 2009-01-15 14:13:39 -08:00
Brian Behlendorf b633e4f669 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2009-01-15 14:11:26 -08:00
Brian Behlendorf da7151a89e Resolve conflict with removed cleaner type 2009-01-15 14:11:19 -08:00
Brian Behlendorf 7aa64936aa Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2009-01-15 14:05:35 -08:00
Brian Behlendorf 977fef2ba7 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2009-01-15 14:05:32 -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 35a269c06c Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2009-01-15 14:05:26 -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