Commit Graph

620 Commits

Author SHA1 Message Date
Brian Behlendorf a9e7b6fc2f Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 10:03:34 -08:00
Brian Behlendorf 67b265106b Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 10:03:31 -08:00
Brian Behlendorf 8578673221 Add DTRACE_PROBE(a) macro 2008-12-19 10:01:38 -08:00
Brian Behlendorf 62f6c8fe77 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 09:54:53 -08:00
Brian Behlendorf fa6f423f31 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-19 09:54:43 -08:00
Brian Behlendorf e17e93da32 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 09:54:04 -08:00
Brian Behlendorf 24e15d1bb1 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 09:52:57 -08:00
Brian Behlendorf 2d0ae2710c Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 09:52:53 -08:00
Brian Behlendorf 5906903384 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-19 09:52:52 -08:00
Brian Behlendorf 3d8832a795 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-19 09:52:51 -08:00
Brian Behlendorf 3bc48c3e74 Missing func readd 2008-12-19 09:50:15 -08:00
Brian Behlendorf 111303eeb8 context 2008-12-19 09:47:09 -08:00
Brian Behlendorf dbc567603d Readd removed hunk 2008-12-19 09:39:17 -08:00
Brian Behlendorf 2c874ef298 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 09:32:53 -08:00
Brian Behlendorf 56217b4c11 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 09:32:50 -08:00
Brian Behlendorf cdcb2af79b Add proper header 2008-12-19 09:30:56 -08:00
Brian Behlendorf 7cf32c82f6 Refresh autogen products 2008-12-19 09:25:52 -08:00
Brian Behlendorf 9ea2ed5b47 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 09:08:07 -08:00
Brian Behlendorf 1e0f1b2c02 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 09:08:03 -08:00
Brian Behlendorf a1e023d7a4 Add strtoxx functions 2008-12-19 09:05:50 -08:00
Brian Behlendorf 3da25300e3 Refresh autogen products 2008-12-18 14:02:22 -08:00
Brian Behlendorf 896e89ac4a Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-18 13:20:15 -08:00
Brian Behlendorf acfcb00a6e Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-18 13:20:04 -08:00
Brian Behlendorf 7299994fcf Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-18 13:19:28 -08:00
Brian Behlendorf da1ceb2bbe Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-18 13:18:27 -08:00
Brian Behlendorf 72bf32a79f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 13:18:19 -08:00
Brian Behlendorf 844a9ced6d Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-18 13:18:17 -08:00
Brian Behlendorf 33e499be43 Merge branch 'fix-stack' into refs/top-bases/fix-branch 2008-12-18 13:18:15 -08:00
Brian Behlendorf 8e136cf0c9 Add noinline macro for userspace 2008-12-18 13:15:58 -08:00
Brian Behlendorf 0172b08863 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-18 10:03:25 -08:00
Brian Behlendorf 16dc43525b Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-18 10:03:15 -08:00
Brian Behlendorf bf922798ae Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-18 10:02:41 -08:00
Brian Behlendorf 4d86e8fa92 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-18 10:01:44 -08:00
Brian Behlendorf 0a353443cd Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 10:01:41 -08:00
Brian Behlendorf 9c0846462b Resolve conflict 2008-12-18 10:01:37 -08:00
Brian Behlendorf 4df7b421a1 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-18 10:00:46 -08:00
Brian Behlendorf 25a3fca866 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 10:00:45 -08:00
Brian Behlendorf 9e195d0cbf Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-18 10:00:44 -08:00
Brian Behlendorf c8f253cda8 Now fixed in fix-pthreads branch 2008-12-18 09:58:42 -08:00
Brian Behlendorf 229aba2943 Properly cast thread functions for pthreads 2008-12-18 09:56:22 -08:00
Brian Behlendorf 893ed2fad0 Properly cast thread functions for pthreads 2008-12-18 09:56:05 -08:00
Brian Behlendorf c037865684 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-18 09:40:10 -08:00
Brian Behlendorf d511dad31e Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-18 09:40:07 -08:00
Brian Behlendorf 5915f86ab1 Add callb.h header 2008-12-18 09:38:10 -08:00
Brian Behlendorf 1c78d7d61d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-18 09:36:25 -08:00
Brian Behlendorf fe5b927a4a Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-18 09:36:22 -08:00
Brian Behlendorf 0a6ac25d10 Add vmem_ interface mapping for user space 2008-12-18 09:34:27 -08:00
Brian Behlendorf e637016382 Refresh autogen products 2008-12-17 16:48:35 -08:00
Brian Behlendorf addd4c977d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 16:47:36 -08:00
Brian Behlendorf c90836a39f Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-17 16:47:17 -08:00
Brian Behlendorf 58e5869872 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-17 16:46:10 -08:00
Brian Behlendorf c27a2516c2 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-17 16:43:55 -08:00
Brian Behlendorf f799177730 Add all sources for libzfs userspace funcationality 2008-12-17 16:39:45 -08:00
Brian Behlendorf 546961cdc0 Add autogen products 2008-12-17 16:24:56 -08:00
Brian Behlendorf 0b022545bf Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 16:08:11 -08:00
Brian Behlendorf 8b33b8f8cd Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-17 16:08:05 -08:00
Brian Behlendorf 0f7520c7b0 Add gethrtime 2008-12-17 16:04:10 -08:00
Brian Behlendorf 210f3e716a Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 16:00:34 -08:00
Brian Behlendorf b07886e188 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-17 16:00:29 -08:00
Brian Behlendorf 9ab4c93028 Wrap more stuff in HAVE_ZPL 2008-12-17 15:58:20 -08:00
Brian Behlendorf 35fe8215ef Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 15:35:43 -08:00
Brian Behlendorf 9877a35f9f Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-17 15:35:41 -08:00
Brian Behlendorf 06005641bb Stub out mount/share related func 2008-12-17 15:33:45 -08:00
Brian Behlendorf 7278ab4224 Refresh autogen products 2008-12-17 14:51:43 -08:00
Brian Behlendorf 89494374b0 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 14:36:45 -08:00
Brian Behlendorf 99a4e4a121 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-17 14:36:43 -08:00
Brian Behlendorf e3150dafb7 Add getexecname to Makefile.am 2008-12-17 14:34:48 -08:00
Brian Behlendorf 25fdaadeb0 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 14:16:22 -08:00
Brian Behlendorf 6a0d0cbd0f Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-17 14:16:20 -08:00
Brian Behlendorf 370f0a1773 Add zone and getmntany sources 2008-12-17 14:14:23 -08:00
Brian Behlendorf 8e0b1b519e Refresh autogen products 2008-12-17 13:39:34 -08:00
Brian Behlendorf fd77571d28 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 13:38:46 -08:00
Brian Behlendorf c1e34481d8 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-17 13:38:38 -08:00
Brian Behlendorf 6a6463a6a6 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-17 13:38:05 -08:00
Brian Behlendorf 3be083292c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-17 13:37:10 -08:00
Brian Behlendorf ba3d5afa54 Add missing \ 2008-12-17 13:35:06 -08:00
Brian Behlendorf effc496583 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 11:37:56 -08:00
Brian Behlendorf 33b73cd800 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-17 11:37:48 -08:00
Brian Behlendorf bda39e3f52 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-17 11:37:16 -08:00
Brian Behlendorf e0f0e02636 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-17 11:36:22 -08:00
Brian Behlendorf 5ea99efac7 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 11:36:20 -08:00
Brian Behlendorf 676ab35598 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-17 11:36:19 -08:00
Brian Behlendorf 0106dabb11 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-17 11:36:18 -08:00
Brian Behlendorf a681d70e28 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 11:36:17 -08:00
Brian Behlendorf e532f6bef4 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 11:36:16 -08:00
Brian Behlendorf 8af904a4b0 Resolve index shadowing /usr/include/string.h:304 2008-12-17 11:34:19 -08:00
Brian Behlendorf ed9a35324d Not sure why Sun needed to remove these externs, but I need them back 2008-12-17 11:32:47 -08:00
Brian Behlendorf 7c5c932505 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 11:28:54 -08:00
Brian Behlendorf d8a55bcb89 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-17 11:28:46 -08:00
Brian Behlendorf 199eaf1874 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-17 11:28:16 -08:00
Brian Behlendorf 01e5ef8ebe Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-17 11:27:23 -08:00
Brian Behlendorf 25db7e9413 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 11:27:21 -08:00
Brian Behlendorf 935fd6c681 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 11:27:20 -08:00
Brian Behlendorf 55c8582174 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 11:27:19 -08:00
Brian Behlendorf dcf0fb9ffb Resolve shadow conflicts 2008-12-17 11:25:21 -08:00
Brian Behlendorf 3932b368f5 Refresh autogen products 2008-12-17 11:20:04 -08:00
Brian Behlendorf 38510987aa Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 11:19:30 -08:00
Brian Behlendorf e5191c5ed5 Resolve conflict 2008-12-17 11:19:19 -08:00
Brian Behlendorf 35257bfbd6 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-17 11:18:11 -08:00
Brian Behlendorf 746c17afcf Resolve conflict 2008-12-17 11:16:41 -08:00
Brian Behlendorf 7973e77bfc Re-add zpool (part of it), we need to build it for the common bits 2008-12-17 11:12:06 -08:00
Brian Behlendorf 1b7fa2b0b2 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 10:45:02 -08:00
Brian Behlendorf 1ef609d29e Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-17 10:45:00 -08:00
Brian Behlendorf 4291b2e02f Add locale.h 2008-12-17 10:43:06 -08:00
Brian Behlendorf 3d74e14dda Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 10:12:34 -08:00
Brian Behlendorf 5ce03568c6 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-17 10:12:32 -08:00
Brian Behlendorf e23605530a Update #ifndef/#defines 2008-12-17 10:10:32 -08:00
Brian Behlendorf 6d524f2906 Cleanup some of the #ifndef/#defines 2008-12-17 10:06:55 -08:00
Brian Behlendorf 07394c4b64 Add mkdev.h rename _SOL_SYS to _LIBSPL_SYS 2008-12-17 10:04:04 -08:00
Brian Behlendorf 994a616c30 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 09:50:58 -08:00
Brian Behlendorf 204ec2e8f4 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-17 09:50:56 -08:00
Brian Behlendorf 0b7ef284bd Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-17 09:50:55 -08:00
Brian Behlendorf bcbf74fead Remove assert/verify support from zfs_context, moved to assert.h 2008-12-17 09:49:02 -08:00
Brian Behlendorf 5945ae3161 Move verify/assert userspace functionality to libspl to simply everything, this way it only lives in one place where you need to build with libzfs.h or zfs_context.h 2008-12-17 09:43:11 -08:00
Brian Behlendorf d6ad828907 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 16:39:13 -08:00
Brian Behlendorf 5c9d50894c Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-16 16:39:02 -08:00
Brian Behlendorf 8ad2f7697a Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-16 16:38:48 -08:00
Brian Behlendorf daa6dfed96 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 16:37:05 -08:00
Brian Behlendorf 715ac6ca88 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 16:34:16 -08:00
Brian Behlendorf 7453ec0f2c Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 16:34:09 -08:00
Brian Behlendorf 8bed8da925 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 16:34:07 -08:00
Brian Behlendorf 2d7f255945 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 16:34:04 -08:00
Brian Behlendorf ebab24f633 Resolve shadow conflict 2008-12-16 16:26:50 -08:00
Brian Behlendorf f1f205e15e Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 16:22:47 -08:00
Brian Behlendorf 2d271e7a94 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-16 16:22:42 -08:00
Brian Behlendorf 3d34904fbb Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-16 16:22:34 -08:00
Brian Behlendorf 015fcbe3b2 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 16:21:32 -08:00
Brian Behlendorf 6a902fe21c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 16:19:56 -08:00
Brian Behlendorf f2bc2f7b6f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 16:19:52 -08:00
Brian Behlendorf fd4da48000 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 16:19:50 -08:00
Brian Behlendorf 29be0d44ba Resolve conflict 2008-12-16 16:19:46 -08:00
Brian Behlendorf 4d21a1c977 Resolve two more shadow conflicts 2008-12-16 16:14:19 -08:00
Brian Behlendorf 71140ec4ac Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 16:10:20 -08:00
Brian Behlendorf 4ee4891d66 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-16 16:10:16 -08:00
Brian Behlendorf 862436f8c9 Strip out userspace interface to mount the FS. I need to talk about the right way to manage these changes with the lustre group at Sun, and see where they stand 2008-12-16 16:06:24 -08:00
Brian Behlendorf ef733219dc Refresh autogen products 2008-12-16 15:53:34 -08:00
Brian Behlendorf 26b307d0d0 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 15:52:53 -08:00
Brian Behlendorf f50ed8e8c6 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-16 15:52:50 -08:00
Brian Behlendorf 1f5373d772 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-16 15:52:46 -08:00
Brian Behlendorf 70c7936ebf Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 15:52:15 -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 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 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 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 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 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 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 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 e213f59844 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 14:34:51 -08:00
Brian Behlendorf bb20fd94fc Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-16 14:34:17 -08:00
Brian Behlendorf 047a942f42 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 14:34:01 -08:00
Brian Behlendorf 79bc1b23ed Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 14:33:59 -08:00
Brian Behlendorf 804830a231 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 14:33:59 -08:00
Brian Behlendorf a8a0f9ea2a Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 14:33:58 -08:00
Brian Behlendorf 9439fbdcd3 Add systeminfo 2008-12-16 14:32:03 -08:00
Brian Behlendorf 53c0cdbc42 Resolve dirname shadow conflict with /usr/include/libgen.h:27 dirname 2008-12-16 14:29:35 -08:00
Brian Behlendorf 01db543e50 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 14:24:24 -08:00
Brian Behlendorf 2c2372389a Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:24:23 -08:00
Brian Behlendorf 7df95c2f31 Add missing header 2008-12-16 14:22:31 -08:00
Brian Behlendorf 33dc3053c0 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 14:19:57 -08:00
Brian Behlendorf e583bf8b9e Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:19:55 -08:00
Brian Behlendorf f6207ec73a Add missing headers 2008-12-16 14:17:29 -08:00
Brian Behlendorf 8417375410 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 14:12:50 -08:00
Brian Behlendorf 52a453edaa Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:12:48 -08:00
Brian Behlendorf 9df591c9d3 Add sys/mount.h header 2008-12-16 14:10:43 -08:00
Brian Behlendorf a7eef78148 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 14:07:02 -08:00
Brian Behlendorf 554defd465 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:07:00 -08:00
Brian Behlendorf 12cb53ce52 Make SHARENFS condition with ZPL 2008-12-16 14:05:09 -08:00
Brian Behlendorf 2b2ceaed9b Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 13:31:49 -08:00
Brian Behlendorf a07043191d Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-16 13:31:46 -08:00
Brian Behlendorf ac3a2f3476 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-16 13:31:42 -08:00
Brian Behlendorf 33072dc1bc Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 13:31:13 -08:00
Brian Behlendorf 8342056a8a Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-16 13:30:38 -08:00
Brian Behlendorf 1d4b1187d7 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 13:30:23 -08:00
Brian Behlendorf 527e38c72b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 13:30:21 -08:00
Brian Behlendorf 34b937c016 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 13:30:21 -08:00
Brian Behlendorf f693a600d0 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 13:30:20 -08:00
Brian Behlendorf 206a3ac58c Resolve 2 more shadow conflicts 2008-12-16 13:28:23 -08:00
Brian Behlendorf 1eee786f73 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 13:22:51 -08:00
Brian Behlendorf e8a56ea793 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-16 13:22:48 -08:00
Brian Behlendorf e329093faf Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-16 13:22:44 -08:00
Brian Behlendorf c78fdcb14a Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 13:22:15 -08:00
Brian Behlendorf 1d4d3c5fa8 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-16 13:21:41 -08:00
Brian Behlendorf b22a5e18fe Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 13:21:25 -08:00