Commit Graph

12492 Commits

Author SHA1 Message Date
Brian Behlendorf cd013fe3b8 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-03-19 21:31:19 -07:00
Brian Behlendorf acf89e041b Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-19 21:31:17 -07:00
Brian Behlendorf 7494305ad8 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-03-19 21:31:09 -07:00
Brian Behlendorf b58bf81e15 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-19 21:31:06 -07:00
Brian Behlendorf 27f2c421c9 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-03-19 21:30:58 -07:00
Brian Behlendorf 4298933698 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-19 21:30:56 -07:00
Brian Behlendorf 61258e349b Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-03-19 21:30:48 -07:00
Brian Behlendorf a85dce5add Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-19 21:30:46 -07:00
Brian Behlendorf 9450f1fd55 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-03-19 21:30:37 -07:00
Brian Behlendorf 8c8e10d491 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-19 21:30:35 -07:00
Brian Behlendorf 18569f4b9e Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-19 21:30:34 -07:00
Brian Behlendorf d254ffa2d4 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-03-19 21:30:18 -07:00
Brian Behlendorf cc0a015671 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-19 21:30:17 -07:00
Brian Behlendorf 61914d7403 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-19 21:30:15 -07:00
Brian Behlendorf be570f34ef Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-03-19 21:30:00 -07:00
Brian Behlendorf bad44ad931 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-03-19 21:29:58 -07:00
Brian Behlendorf a8b15f8550 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-03-19 21:29:49 -07:00
Brian Behlendorf 66f41d5cc6 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-03-19 21:29:47 -07:00
Brian Behlendorf cae91e893a Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-03-19 21:29:39 -07:00
Brian Behlendorf ea8c53f9e1 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-19 21:29:37 -07:00
Brian Behlendorf 3ca34d8fc5 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-03-19 21:29:28 -07:00
Brian Behlendorf 1b88587905 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-19 21:29:26 -07:00
Brian Behlendorf 0aef3aeaef Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-03-19 21:29:16 -07:00
Brian Behlendorf 30eaed5564 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-19 21:29:14 -07:00
Brian Behlendorf 16b5e3c00b Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-03-19 21:29:04 -07:00
Brian Behlendorf fae796611c Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-03-19 21:29:02 -07:00
Brian Behlendorf 56d18263ed Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-19 21:28:54 -07:00
Brian Behlendorf 0ebc97288a Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-19 21:28:52 -07:00
Brian Behlendorf bd1685ee4e Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-19 21:28:51 -07:00
Brian Behlendorf 1769e10f17 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-03-19 21:28:50 -07:00
Brian Behlendorf a891a11671 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2009-03-19 21:28:48 -07:00
Brian Behlendorf 6d883d7d40 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2009-03-19 21:28:48 -07:00
Brian Behlendorf 63781842e3 Update mutex_lock to pthread_mutex_lock for zcl->zcl_callback_locks. 2009-03-19 21:21:35 -07:00
Brian Behlendorf 64684cadfa Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2009-03-19 21:19:28 -07:00
Brian Behlendorf fed604c844 Add extra () requested by gcc 2009-03-19 21:18:54 -07:00
Brian Behlendorf d0b5329c2f Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-03-19 21:13:24 -07:00
Brian Behlendorf 9ab7adb553 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-03-19 21:13:22 -07:00
Brian Behlendorf e60e60982e Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-03-19 21:13:12 -07:00
Brian Behlendorf 4f2dfa3c94 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-19 21:13:11 -07:00
Brian Behlendorf bcfd29607d Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-03-19 21:13:02 -07:00
Brian Behlendorf df43fa9472 Merge commit 'refs/top-bases/linux-unused' into linux-unused
Conflicts:

	lib/libzpool/include/sys/zfs_context.h
2009-03-19 21:12:49 -07:00
Brian Behlendorf 8bb6579ac8 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-19 21:11:48 -07:00
Brian Behlendorf 37c55dde9f Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-19 21:11:46 -07:00
Brian Behlendorf 82f47c145f Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-03-19 21:11:37 -07:00
Brian Behlendorf 665c272091 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-19 21:11:35 -07:00
Brian Behlendorf bdb4ef9d51 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-03-19 21:11:27 -07:00
Brian Behlendorf a676a29d25 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-19 21:11:25 -07:00
Brian Behlendorf 7a5e3e9221 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-03-19 21:11:13 -07:00
Brian Behlendorf c141f3113e Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-03-19 21:11:11 -07:00
Brian Behlendorf 72ad509fec Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-03-19 21:11:02 -07:00