Commit Graph

198 Commits

Author SHA1 Message Date
Brian Behlendorf be3ffc5f9e Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-02-18 14:36:16 -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 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 d58ed0e6c7 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-15 14:21:36 -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 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 d2d018fafa Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-09 15:11:29 -08:00
Brian Behlendorf 6791a1ee34 I don't think we need this in userspace 2009-01-09 15:07:32 -08:00
Brian Behlendorf fd07f08222 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-09 14:46:14 -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 dd069ed4fe Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-08 10:28:52 -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 73e48eae6d Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-05 13:47:03 -08:00
Brian Behlendorf c15fa0ceb0 Add include paths 2009-01-05 13:44:26 -08:00
Brian Behlendorf 727a4622dc Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-05 12:41:24 -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 a9545c30e8 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-22 14:45:14 -08:00
Brian Behlendorf 29b47d366e Remove some headers 2008-12-22 14:42:02 -08:00
Brian Behlendorf 9bf58af1f5 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-22 13:52:31 -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
Brian Behlendorf 6bed331e59 More compat changes 2008-12-22 13:47:58 -08:00
Brian Behlendorf 56f6031652 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-22 12:54:37 -08:00
Brian Behlendorf 121effcbee Pull everything in to the Makefile 2008-12-22 12:51:03 -08:00
Brian Behlendorf d0cacda56c Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-22 11:42:04 -08:00
Brian Behlendorf 7047bb0678 Add missing files from Makefile.am 2008-12-22 11:36:48 -08:00
Brian Behlendorf 7e1406dd6c Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-22 10:37:24 -08:00
Brian Behlendorf 10911f9d71 Add missing sources 2008-12-22 10:27:41 -08:00
Brian Behlendorf b15673351e Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-19 16:57:06 -08:00
Brian Behlendorf 60289ccd8f Add zfs_byteswap 2008-12-19 16:51:14 -08:00
Brian Behlendorf 66be6018a5 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-19 16:35:27 -08:00
Brian Behlendorf 96813619bf Pull in new background scrubber 2008-12-19 16:29:13 -08:00
Brian Behlendorf f5d11f37bd Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-19 13:38:29 -08:00
Brian Behlendorf 8ab575cd8e Remove vdev_disk.c from userspace build, we simply use vdev_file.c here 2008-12-19 13:35:29 -08:00
Brian Behlendorf 6216d4cd8a Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-19 12:10:34 -08:00
Brian Behlendorf e485017676 Remove spa_boot from userspace build 2008-12-19 12:04:45 -08:00
Brian Behlendorf bc5f8da7f6 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-19 10:19:32 -08:00
Brian Behlendorf 9de4108779 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 10:18:12 -08:00
Brian Behlendorf 3e2e5c4535 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-19 10:18:12 -08:00
Brian Behlendorf a68af79057 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-19 10:18:11 -08:00
Brian Behlendorf d4c39af7a6 Re-add KM_PUSHPAGE 2008-12-19 10:15:52 -08:00
Brian Behlendorf 330840ff2e Re-add KM_PUSHPAGE 2008-12-19 10:15:27 -08:00