Commit Graph

185 Commits

Author SHA1 Message Date
Brian Behlendorf 0b5ddcfdca Refresh autogen products 2009-03-11 22:31:29 -07:00
Brian Behlendorf 8cb718a76c Refresh autogen products 2009-03-11 14:25:09 -07:00
Brian Behlendorf b8dd7de0b5 Refresh autogen products 2009-03-11 13:30:38 -07:00
Brian Behlendorf d5fd9f25a3 Refresh autogen products 2009-03-10 22:09:49 -07:00
Brian Behlendorf b775e4c206 Refresh autogen products 2009-03-10 22:04:11 -07:00
Brian Behlendorf 401cd9e1d4 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-03-10 21:31:09 -07:00
Brian Behlendorf 36860ec1a8 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:

	module/Makefile.in
2009-03-10 21:23:17 -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 e1b736ecc8 Refresh autogen products 2009-03-10 11:42:01 -07:00
Brian Behlendorf b4028a1bf5 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-02-18 14:38:55 -08:00
Brian Behlendorf 8090a9a908 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:

	cmd/zpool/zpool_main.c
2009-02-18 14:31:46 -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 d164b20935 Rebase master to b108 2009-02-18 12:51:31 -08:00
Brian Behlendorf 5801f33f50 Refresh autogen products 2009-01-09 15:12:36 -08:00
Brian Behlendorf e05d7c1e7e Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-09 15:12:00 -08:00
Brian Behlendorf 522fb18428 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-09 15:10:26 -08:00
Brian Behlendorf 6791a1ee34 I don't think we need this in userspace 2009-01-09 15:07:32 -08:00
Brian Behlendorf 347805ecd8 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-09 14:46:45 -08:00
Brian Behlendorf d315fcf28e Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-09 14:45:13 -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 9855548496 Refresh autogen products 2009-01-09 11:35:52 -08:00
Brian Behlendorf 2cc958820e Refresh autogen products 2009-01-08 10:42:46 -08:00
Brian Behlendorf 62ce1a5d0e Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-08 10:29:29 -08:00
Brian Behlendorf b7d9adb500 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-08 10:27:42 -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 4996278dd4 Refresh autogen products 2009-01-05 13:48:29 -08:00
Brian Behlendorf 46d1c1ff3d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-05 13:47:32 -08:00
Brian Behlendorf 80ed6c342d Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-05 13:46:06 -08:00
Brian Behlendorf c15fa0ceb0 Add include paths 2009-01-05 13:44:26 -08:00
Brian Behlendorf 9403f4a605 Refresh autogen products 2008-12-23 12:39:25 -08:00
Brian Behlendorf d8c0d57440 Refresh autogen products 2008-12-23 10:41:37 -08:00
Brian Behlendorf d46a4ba0dc Refresh autogen products 2008-12-22 14:55:05 -08:00
Brian Behlendorf f23a920ddd Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 14:45:48 -08:00
Brian Behlendorf ff8a2f61ff Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 14:44:07 -08:00
Brian Behlendorf 29b47d366e Remove some headers 2008-12-22 14:42:02 -08:00
Brian Behlendorf 75b5893ca5 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 13:53:09 -08:00
Brian Behlendorf 05fafc638f Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 13:51:21 -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 d1178104fb Refresh autogen products 2008-12-22 12:55:48 -08:00
Brian Behlendorf d259de062c Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 12:55:11 -08:00
Brian Behlendorf b93191445c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 12:53:27 -08:00
Brian Behlendorf 121effcbee Pull everything in to the Makefile 2008-12-22 12:51:03 -08:00
Brian Behlendorf 4f1e40767b Refresh autogen products 2008-12-22 11:46:00 -08:00
Brian Behlendorf 31ff40b9ec Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 11:42:32 -08:00
Brian Behlendorf aece7f6822 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 11:40:54 -08:00