4dcbc1fc67
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-21 15:59:14 -07:00
f9cb9780a0
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-21 15:58:50 -07:00
1d5ebc3210
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-21 15:58:48 -07:00
b8b1cb618a
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-21 15:58:25 -07:00
08742b5020
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-21 15:58:23 -07:00
2ae2dcb003
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-21 15:58:00 -07:00
f1d064c189
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-21 15:57:58 -07:00
c0c868786a
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-21 15:57:34 -07:00
db6b5f7482
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-21 15:57:32 -07:00
0da4c91191
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-21 15:57:09 -07:00
86e1295b79
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-21 15:57:07 -07:00
6c054707ce
Remove TODO file for spec file.
2010-05-21 15:40:24 -07:00
08f8d79beb
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-05-21 15:37:07 -07:00
a8438870bb
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-21 15:37:05 -07:00
375f0e4db1
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-21 15:36:42 -07:00
e781854469
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-21 15:36:39 -07:00
ecebeeb7e5
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-21 15:36:38 -07:00
542052314e
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-21 15:35:53 -07:00
02d1ad4f15
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-05-21 15:35:50 -07:00
8f1882a06e
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-05-21 15:35:27 -07:00
4683da31f6
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-05-21 15:35:25 -07:00
c01ea509f6
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-05-21 15:35:02 -07:00
5e4314a4ed
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-05-21 15:35:00 -07:00
29d01df48d
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-05-21 15:34:37 -07:00
8ad18a3e74
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-21 15:34:34 -07:00
2468e6d67d
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-05-21 15:34:11 -07:00
230510ddac
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-05-21 15:34:09 -07:00
3e2e28cfa3
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-21 15:33:46 -07:00
ac1868953c
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-21 15:33:44 -07:00
bcc7d1c258
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-21 15:33:21 -07:00
3fd78da576
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-21 15:33:18 -07:00
fa51680025
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-21 15:32:55 -07:00
c52e9f28a4
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-21 15:32:53 -07:00
45c88a2f20
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-21 15:32:29 -07:00
909c60e23f
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-21 15:32:27 -07:00
35c46bb0e5
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-21 15:32:04 -07:00
ea5ced8e55
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-21 15:32:02 -07:00
af12c8fa08
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-21 15:31:38 -07:00
4529531127
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-21 15:31:36 -07:00
77b2f748a0
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-21 15:31:12 -07:00
08a4e1267d
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-21 15:31:10 -07:00
733007a14c
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-21 15:30:47 -07:00
b9eb575992
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-21 15:30:45 -07:00
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
4221c8cf93
Minor spec file cleanup for RHEL6 package dependency.
2010-05-21 15:08:08 -07:00
1573fc9932
Cast to (const time_t *) to fix compiler type warning.
2010-05-21 15:06:25 -07:00
94655e1c30
Use __blk_end_request() in zvol_request() to avoid ZVOL deadlock.
...
The unlocked version of blk_end_request() should be used in the
zvol_request() error handling to avoid deadlocking the request_queue
queue_lock. Things get a little more complicated for older kernel
APIs but the compat layer has been updated as well to reflect this.
2010-05-21 15:01:12 -07:00
14152c7b2c
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-05-21 10:49:47 -07:00
868e5de066
Add linux-user-util topic branch.
...
This topic branch contains required changes to the user space
utilities to allow them to integrate cleanly with Linux.
2010-05-21 10:47:59 -07:00
3b79eba6d7
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-21 10:44:28 -07:00
Brian Behlendorf