Commit Graph

3654 Commits

Author SHA1 Message Date
Brian Behlendorf 0ab548c390 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-05-27 17:03:06 -07:00
Brian Behlendorf 2fbe461b55 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-27 17:02:15 -07:00
Brian Behlendorf a7dcb2247a Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-05-27 17:02:14 -07:00
Brian Behlendorf 03fdccb846 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-05-27 17:02:14 -07:00
Brian Behlendorf 146ded4db2 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2010-05-27 17:02:13 -07:00
Brian Behlendorf db069704ed Revert fix-clock-wrap fixed upstream
This was more or less fixed upstream.  Instead of directly accessing
lbolt they now use ddi_get_lbolt() which we can have do the right
thing is the SPL so we don't need to carry this patch.
2010-05-27 16:54:23 -07:00
Brian Behlendorf 8961c991b9 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-05-27 16:41:27 -07:00
Brian Behlendorf dcf4bc1e52 Re-remove feature-branch dependency. 2010-05-27 16:34:02 -07:00
Brian Behlendorf b23468df87 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-05-27 16:22:13 -07:00
Brian Behlendorf ea431b4dc6 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-27 16:14:04 -07:00
Brian Behlendorf 319f69734b Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Conflicts:
	cmd/ztest/ztest.c
2010-05-27 16:13:19 -07:00
Brian Behlendorf 390995db28 Revert all remaining changes. 2010-05-27 14:25:06 -07:00
Brian Behlendorf 63fce783d6 Readd feature-branch to get the last of the reversions 2010-05-27 14:23:51 -07:00
Brian Behlendorf 1961012286 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-05-27 14:20:33 -07:00
Brian Behlendorf 0e46276339 Remove feature-branch.
All but the pthreads changes have been committed upstream and in
the name of keeping the topgit tree as simple as possible I'm removing
the entire 'feature' subtree.  The pthreads changes are now a 'fix'.
2010-05-27 14:17:51 -07:00
Brian Behlendorf 6bc8f58aad Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-05-27 14:15:20 -07:00
Brian Behlendorf b265da19f0 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2010-05-27 14:15:08 -07:00
Brian Behlendorf 3a7896c8d2 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-27 14:15:08 -07:00
Brian Behlendorf c7742fd698 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2010-05-27 14:15:07 -07:00
Brian Behlendorf 5c16b9898b Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2010-05-27 14:15:07 -07:00
Brian Behlendorf b754295dec Revert feature-zap-cursor-to-key feature upstream
We can drop this feature and we will pick up the lastest version
during the b141 update.
2010-05-27 14:12:59 -07:00
Brian Behlendorf f1c228cb78 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-05-27 13:57:29 -07:00
Brian Behlendorf 249ae381e1 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2010-05-27 13:57:16 -07:00
Brian Behlendorf 59104b4325 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-27 13:57:16 -07:00
Brian Behlendorf 262c747b4c Remove feature-pthreads topic branch 2010-05-27 13:54:07 -07:00
Brian Behlendorf 9a6d4c547a Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-05-27 13:51:51 -07:00
Brian Behlendorf d8e5eb56b8 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2010-05-27 13:42:00 -07:00
Brian Behlendorf 028e42b692 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-27 13:42:00 -07:00
Brian Behlendorf cde6e6fec8 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2010-05-27 13:40:15 -07:00
Brian Behlendorf 1dc4235011 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2010-05-27 13:40:14 -07:00
Brian Behlendorf ca50214549 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2010-05-27 13:40:14 -07:00
Brian Behlendorf 1e32b3c781 Revert feature-commit-cb feature upstream
We can drop this feature and we will pick up the lastest version
during the b141 update.
2010-05-27 13:39:17 -07:00
Brian Behlendorf 9f83c4b546 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
Conflicts:
	lib/libzpool/kernel.c
2010-05-27 13:36:18 -07:00
Brian Behlendorf c17d3e05eb Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2010-05-27 13:32:58 -07:00
Brian Behlendorf 51536ea5f4 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-27 13:32:58 -07:00
Brian Behlendorf a082023842 Merge commit 'refs/top-bases/feature-branch' into feature-branch
Conflicts:
	cmd/ztest/ztest.c
	lib/libzpool/include/sys/zfs_context.h
	lib/libzpool/kernel.c
	lib/libzpool/taskq.c
2010-05-27 13:30:48 -07:00
Brian Behlendorf 3bd93e7103 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2010-05-27 13:25:20 -07:00
Brian Behlendorf 099e8e493a Remove feature-pthreads prior to b141 update.
The pthreads change will need to be reworked and reapplied.
This will be easier to do from scratch rather than sort out
the merge.
2010-05-27 13:23:58 -07:00
Brian Behlendorf 087c3a93c7 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-05-23 10:05:15 -07:00
Brian Behlendorf fd6bf51a0a Use more correct /usr/bin/awk patch for default. 2010-05-23 09:57:05 -07:00
Brian Behlendorf f36da16d36 Skip /dev/watchdog when scanning /dev/ for import.
Do not open /dev/watchdog to stat it because it requires a special
close or the watchdog with be triggered and the system reset.
2010-05-23 09:38:29 -07:00
Brian Behlendorf a48738bd69 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-05-21 16:48:42 -07:00
Brian Behlendorf 5da0e30597 Ensure COPYRIGHT file is included in the package. 2010-05-21 16:34:38 -07:00
Brian Behlendorf 4dcbc1fc67 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-05-21 15:59:14 -07:00
Brian Behlendorf 6c054707ce Remove TODO file for spec file. 2010-05-21 15:40:24 -07:00
Brian Behlendorf c52e9f28a4 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-05-21 15:32:53 -07:00
Brian Behlendorf 84c7c5fb58 Prep for 0.4.9 tag update META, README, ChangeLog.
Updated README to reflect the current state of the project and to
be less developer focused.  It now simply includes basic build
instructions for packages and little example of some of the cool
things you can do.

Also remove the out of data TODO file.  This sort of thing can
and be tracked on the GitHub issue tracker.
2010-05-21 15:11:49 -07:00
Brian Behlendorf 4221c8cf93 Minor spec file cleanup for RHEL6 package dependency. 2010-05-21 15:08:08 -07:00
Brian Behlendorf 84506949ec Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-05-20 10:26:08 -07:00
Brian Behlendorf b50494ba2d Add missing header observed after linux-legacy was reverted.
Interestingly this has only been a problem on a clean RHEL6
install so I suspect the include was removed from one of the
standard system include headers.  We should be including it
explicitly anyway since it's used in both of these .c files.
2010-05-20 10:04:10 -07:00