Commit Graph

469 Commits

Author SHA1 Message Date
Brian Behlendorf 47c6526993 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-02-18 14:35:09 -08:00
Brian Behlendorf 8241395b5a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-02-18 14:35:05 -08:00
Brian Behlendorf 9f4865e4ca Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-02-18 14:34:45 -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 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 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 f1300cddb7 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-15 16:32:30 -08:00
Brian Behlendorf f33c13d11d Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-15 16:32:27 -08:00
Brian Behlendorf 41cba9f136 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-15 16:32:08 -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 865347e0be Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-15 15:30:05 -08:00
Brian Behlendorf 702ba8cdf7 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-15 15:30:04 -08:00
Brian Behlendorf 9c8802c7e4 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-15 15:29:55 -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 c6412aa523 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-15 14:52:57 -08:00
Brian Behlendorf 7c879f3b8b Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-15 14:52:56 -08:00
Brian Behlendorf 141235d905 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-15 14:52:47 -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 dd2e5734f7 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-15 14:39:26 -08:00
Brian Behlendorf 4c1ba3d379 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-15 14:39:25 -08:00
Brian Behlendorf 1a4ae03863 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-15 14:39:18 -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 574b2c897e Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-15 14:29:58 -08:00
Brian Behlendorf 372dba924d Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-15 14:29:58 -08:00
Brian Behlendorf ab52989424 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-15 14:29:50 -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 924bc262cc Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-15 14:21:05 -08:00
Brian Behlendorf ee1faab64d Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-15 14:21:03 -08:00
Brian Behlendorf 091a4a4ca4 Resolve conflict with removed cleaner type 2009-01-15 14:20:49 -08:00
Brian Behlendorf ddaad20220 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 14:16:23 -08:00