Commit Graph

4767 Commits

Author SHA1 Message Date
Brian Behlendorf 13cc892152 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-16 15:51:48 -08:00
Brian Behlendorf b3abc249a7 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-16 15:51:44 -08:00
Brian Behlendorf 88d7e80fe2 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-16 15:51:43 -08:00
Brian Behlendorf 50f200f7aa Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-16 15:51:40 -08:00
Brian Behlendorf a77d20e66b Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-16 15:51:39 -08:00
Brian Behlendorf b09a62570a Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-16 15:51:36 -08:00
Brian Behlendorf 7cdee6401d Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-16 15:51:34 -08:00
Brian Behlendorf 927404ab2c Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-16 15:51:31 -08:00
Brian Behlendorf 93a2ebff4a Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-16 15:51:30 -08:00
Brian Behlendorf e92ff63a0d Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-16 15:51:27 -08:00
Brian Behlendorf 8be6dc411d Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-16 15:51:26 -08:00
Brian Behlendorf e5000a1073 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 15:51:22 -08:00
Brian Behlendorf 526521549d Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-16 15:51:21 -08:00
Brian Behlendorf 12c13fbafb Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 15:51:20 -08:00
Brian Behlendorf 4583b6d5ba Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 15:51:19 -08:00
Brian Behlendorf e0a7138ef2 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-16 15:51:19 -08:00
Brian Behlendorf e14e140b52 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 15:51:19 -08:00
Brian Behlendorf 3c515284a6 Remove double declaration of char * 2008-12-16 15:49:21 -08:00
Brian Behlendorf f73c835830 Add include patch to pick up fletcher.c which for some unknown reason is included instead of simply being build as source. This should be fixed eventually, but it is how the OpenSolaris source handles it. 2008-12-16 15:44:02 -08:00
Brian Behlendorf 4bed7d4e49 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 15:34:52 -08:00
Brian Behlendorf 1c42a85a37 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-16 15:34:51 -08:00
Brian Behlendorf 7e43e16395 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-16 15:34:50 -08:00
Brian Behlendorf 35f607040f Wrap additional new efi code in HAVE_LIBEFI macros 2008-12-16 15:33:00 -08:00
Brian Behlendorf f1a115a43b Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 15:22:50 -08:00
Brian Behlendorf 6899898d40 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-16 15:22:49 -08:00
Brian Behlendorf 6e002c41b8 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-16 15:22:48 -08:00
Brian Behlendorf a3ea268b72 Add 2 missing headers 2008-12-16 15:20:56 -08:00
Brian Behlendorf 59a704e2e1 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 15:17:55 -08:00
Brian Behlendorf 120aad2ea2 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-16 15:17:54 -08:00
Brian Behlendorf ca161b928b Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-16 15:17:54 -08:00
Brian Behlendorf 36722eee12 Comment out most of the file until ZPL support arrives 2008-12-16 15:16:04 -08:00
Brian Behlendorf 618ef3269b Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 14:45:33 -08:00
Brian Behlendorf e20e376bce Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-16 14:45:32 -08:00
Brian Behlendorf 6d01a82ce5 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:45:32 -08:00
Brian Behlendorf ef919ac403 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:45:31 -08:00
Brian Behlendorf 66587f0fee Remove all the share stuff 2008-12-16 14:43:38 -08:00
Brian Behlendorf 66cf9db3d0 Remove non-existing systeminfo ref 2008-12-16 14:38:52 -08:00
Brian Behlendorf af860a0ef2 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 14:35:27 -08:00
Brian Behlendorf 099534f401 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-16 14:35:26 -08:00
Brian Behlendorf bc3c049cf3 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-16 14:35:25 -08:00
Brian Behlendorf 646230294f Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-16 14:35:24 -08:00
Brian Behlendorf 1f0ad04f2d Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:35:21 -08:00
Brian Behlendorf dbd5e397c5 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-16 14:35:20 -08:00
Brian Behlendorf 6df0ae3703 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-16 14:35:17 -08:00
Brian Behlendorf e658a0f952 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-16 14:35:16 -08:00
Brian Behlendorf bbcc9f116f Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-16 14:35:13 -08:00
Brian Behlendorf 56692ac3aa Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-16 14:35:12 -08:00
Brian Behlendorf 5385f3b6e8 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-16 14:35:09 -08:00
Brian Behlendorf 653f9a6961 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-16 14:35:08 -08:00
Brian Behlendorf c201c67bfd Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-16 14:35:04 -08:00