Commit Graph

7970 Commits

Author SHA1 Message Date
Brian Behlendorf 62ce4aabc6 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-09 09:22:33 -08:00
Brian Behlendorf 47f49e3634 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 09:22:33 -08:00
Brian Behlendorf 8e6e01febb Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-09 09:22:27 -08:00
Brian Behlendorf 1a106f9b4e Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-09 09:22:25 -08:00
Brian Behlendorf ed92da1e4e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-09 09:22:24 -08:00
Brian Behlendorf 5fe980337e Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-01-09 09:22:19 -08:00
Brian Behlendorf a230183b17 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-09 09:22:17 -08:00
Brian Behlendorf 5e108eed1f Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-01-09 09:22:13 -08:00
Brian Behlendorf a8fde88d7b Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-01-09 09:22:11 -08:00
Brian Behlendorf 51b83cd96f Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-01-09 09:22:08 -08:00
Brian Behlendorf da587d49cb Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-09 09:22:06 -08:00
Brian Behlendorf 25a916da37 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-01-09 09:22:03 -08:00
Brian Behlendorf 814d344f5e Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-09 09:22:01 -08:00
Brian Behlendorf c59b825666 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-01-09 09:21:58 -08:00
Brian Behlendorf 620c143386 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-01-09 09:21:56 -08:00
Brian Behlendorf b4bd7364a4 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-01-09 09:21:52 -08:00
Brian Behlendorf b577bb93c7 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-01-09 09:21:50 -08:00
Brian Behlendorf 110393189c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-09 09:21:47 -08:00
Brian Behlendorf a534a8bd1f Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-09 09:21:36 -08:00
Brian Behlendorf 91b9bf3f40 Pulling zvol, zfs_vfsops, and zfs_ioctl to resolve those build issues 2009-01-09 09:19:33 -08:00
Brian Behlendorf cb2148d644 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-08 16:57:23 -08:00
Brian Behlendorf 7b4f45a7fc Update zpios.sh to use zfs.sh plus error handling 2009-01-08 16:53:29 -08:00
Brian Behlendorf f837db6174 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-08 16:28:42 -08:00
Brian Behlendorf b6a9f6b5c8 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-08 16:28:39 -08:00
Brian Behlendorf be6ab79f95 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-01-08 16:28:33 -08:00
Brian Behlendorf 2b51f503ed Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-08 16:28:28 -08:00
Brian Behlendorf c2369bb566 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-01-08 16:28:23 -08:00
Brian Behlendorf 458df68cee Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-08 16:28:20 -08:00
Brian Behlendorf 9f82919dac Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-08 16:28:11 -08:00
Brian Behlendorf 0270ffced8 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-08 16:28:08 -08:00
Brian Behlendorf a4f8212ee7 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-01-08 16:28:01 -08:00
Brian Behlendorf 5be1e6ed1e Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-08 16:27:57 -08:00
Brian Behlendorf f2895d2dcc Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-01-08 16:27:51 -08:00
Brian Behlendorf f6c9b543da Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-01-08 16:27:48 -08:00
Brian Behlendorf 0441ef8a43 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-01-08 16:27:41 -08:00
Brian Behlendorf 82d3a97667 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-08 16:27:37 -08:00
Brian Behlendorf d38a1fec6a Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-01-08 16:27:29 -08:00
Brian Behlendorf 7aa850cbd1 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-08 16:27:27 -08:00
Brian Behlendorf 1e8830ebb2 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-08 16:27:20 -08:00
Brian Behlendorf b3f305e7e7 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-08 16:27:16 -08:00
Brian Behlendorf 723ab6f8b9 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-08 16:27:08 -08:00
Brian Behlendorf d4cff60f94 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-08 16:27:03 -08:00
Brian Behlendorf d234bccbac Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-08 16:26:54 -08:00
Brian Behlendorf a399a5b71a Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-08 16:26:49 -08:00
Brian Behlendorf 934aae1842 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-08 16:26:42 -08:00
Brian Behlendorf 11c4e419e7 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-08 16:26:37 -08:00
Brian Behlendorf b7918bc08e Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-08 16:26:35 -08:00
Brian Behlendorf be5dbb6df3 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-08 16:26:23 -08:00
Brian Behlendorf 5686e7d5db Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-08 16:26:18 -08:00
Brian Behlendorf 162157e07c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-08 16:26:16 -08:00