Commit Graph

213 Commits

Author SHA1 Message Date
Brian Behlendorf 26f70525ee Refresh autogen products 2009-06-08 16:33:33 -07:00
Brian Behlendorf 51b59652a3 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-03-19 21:13:28 -07:00
Brian Behlendorf 7f33364d3c Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
Conflicts:

	lib/libzpool/include/sys/zfs_context.h
	module/zfs/dmu_tx.c
	module/zfs/txg.c
2009-03-19 21:03:58 -07:00
Brian Behlendorf e7f02d3b41 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-19 20:59:33 -07:00
Brian Behlendorf eb811f7fa9 Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Conflicts:

	module/zfs/include/sys/dmu_tx.h
	module/zfs/include/sys/txg.h
2009-03-19 20:59:12 -07:00
Brian Behlendorf 54b5b41a58 Add 'feature-pthreads' branch to features branch. 2009-03-19 20:49:52 -07:00
Brian Behlendorf 61cd467f6d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-03-19 19:58:45 -07:00
Brian Behlendorf 5e5d31f105 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:

	lib/libzpool/include/sys/zfs_context.h
2009-03-19 19:52:21 -07:00
Brian Behlendorf 8c43ad3853 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-19 19:49:56 -07:00
Brian Behlendorf 8cdcf1ef44 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-03-19 19:49:55 -07:00
Brian Behlendorf 05cec154f5 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2009-03-19 19:49:53 -07:00
Brian Behlendorf 53db4c7b29 Revert fix-pthreads moving to feature-pthreads branch 2009-03-19 19:43:09 -07:00
Brian Behlendorf 7fa1ced508 Refresh autogen products, remove stray zdump Makefile.in 2009-03-12 16:48:12 -07:00
Brian Behlendorf 0fe418c548 Refresh autogen products 2009-03-12 15:55:23 -07:00
Brian Behlendorf 6a1223268c Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-03-12 15:47:43 -07:00
Brian Behlendorf 5a7e7e9d3b Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-12 15:44:18 -07:00
Brian Behlendorf 82ce8b00f3 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-12 15:44:14 -07:00
Brian Behlendorf 6a5acaa105 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-12 15:44:13 -07:00
Brian Behlendorf 9fe5b916e2 Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch 2009-03-12 15:39:27 -07:00
Brian Behlendorf 9e49df6b20 Add gcc-fortify-source branch 2009-03-12 15:38:51 -07:00
Brian Behlendorf c856450b52 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-03-12 15:15:45 -07:00
Brian Behlendorf 35b117277d Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-12 15:12:26 -07:00
Brian Behlendorf f2e7d57653 Packaging update
Make LINUX_VERSION available to Makefile's, add packaging
for user space include headers.
2009-03-12 15:07:29 -07:00
Brian Behlendorf 808e542240 Refresh autogen products 2009-03-12 11:06:21 -07:00
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 15f5ddebdf Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
Conflicts:

	lib/libzpool/kernel.c
2009-02-18 14:29:08 -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 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