Commit Graph

1530 Commits

Author SHA1 Message Date
Brian Behlendorf 7e9bd9b2d7 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-12 10:59:34 -08:00
Brian Behlendorf 601b2d2c43 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-12 10:59:30 -08:00
Brian Behlendorf 4d54aed828 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 10:59:19 -08:00
Brian Behlendorf 775b36b66c Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 10:59:13 -08:00
Brian Behlendorf 8d9ea8f9d5 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-12 10:59:05 -08:00
Brian Behlendorf da10598d26 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 10:58:50 -08:00
Brian Behlendorf 9fbc572a59 Refine Makefiles 2008-12-12 10:57:05 -08:00
Brian Behlendorf 8182ac40b1 Refresh autogen products 2008-12-12 10:49:23 -08:00
Brian Behlendorf 79edf81a7d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 10:47:00 -08:00
Brian Behlendorf bef1b1cd5b Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 10:45:38 -08:00
Brian Behlendorf 22c2a372b9 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-12 10:45:30 -08:00
Brian Behlendorf 266ab8c268 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 10:45:08 -08:00
Brian Behlendorf 6f0a0f1f5f Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-12 10:45:03 -08:00
Brian Behlendorf c0e97ee28d Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-12 10:44:59 -08:00
Brian Behlendorf 3b0ebda451 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 10:44:49 -08:00
Brian Behlendorf 9d5e714ca4 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 10:44:43 -08:00
Brian Behlendorf 760b2a3f0f Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-12 10:44:35 -08:00
Brian Behlendorf 8aff6b7eec Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 10:44:20 -08:00
Brian Behlendorf d7ec1ed532 Refine Makefiles 2008-12-12 10:43:39 -08:00
Brian Behlendorf ee37692b41 Refresh autogen products 2008-12-12 10:40:02 -08:00
Brian Behlendorf 1f5295bc51 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 10:38:53 -08:00
Brian Behlendorf 6d0d603ee1 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 10:38:51 -08:00
Brian Behlendorf 9a30c4847f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-12 10:38:43 -08:00
Brian Behlendorf 92afe68367 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 10:38:23 -08:00
Brian Behlendorf 5b7cbb0234 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-12 10:38:19 -08:00
Brian Behlendorf d7ac648d3e Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-12 10:38:15 -08:00
Brian Behlendorf 7eb016ef42 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 10:38:04 -08:00
Brian Behlendorf 58842db464 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 10:37:58 -08:00
Brian Behlendorf 4ffa0c8e19 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-12 10:37:49 -08:00
Brian Behlendorf d7761f89ae Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 10:37:35 -08:00
Brian Behlendorf 76e1c54125 Refine Makefiles 2008-12-12 10:36:14 -08:00
Brian Behlendorf 7297c6d959 Refresh autogen products 2008-12-12 10:31:54 -08:00
Brian Behlendorf 1aa5fd7397 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 10:30:39 -08:00
Brian Behlendorf 323d5b5414 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-12 10:30:38 -08:00
Brian Behlendorf d06634c325 Resolve shadow conflict with 'link' local 2008-12-12 10:24:38 -08:00
Brian Behlendorf 609680b177 Refresh autogen products 2008-12-12 10:20:55 -08:00
Brian Behlendorf 9d9b8827d0 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 10:13:21 -08:00
Brian Behlendorf 662df0d70a Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 10:13:19 -08:00
Brian Behlendorf 78d663ba36 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-12 10:13:11 -08:00
Brian Behlendorf 30b11b1bb0 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 10:12:51 -08:00
Brian Behlendorf 87935f5077 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-12 10:12:47 -08:00
Brian Behlendorf f2ecf35ad6 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-12 10:12:43 -08:00
Brian Behlendorf 4846b5850f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 10:12:32 -08:00
Brian Behlendorf 9ca1163310 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 10:12:26 -08:00
Brian Behlendorf adbfba8f2a Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-12 10:12:18 -08:00
Brian Behlendorf 9a4109a11c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 10:12:03 -08:00
Brian Behlendorf 6d78e69193 Add missing include patch 2008-12-12 10:10:16 -08:00
Brian Behlendorf 371162346a Add autogen products 2008-12-12 09:35:47 -08:00
Brian Behlendorf 212ec0c394 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 09:34:36 -08:00
Brian Behlendorf 5664869614 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-12 09:34:35 -08:00
Brian Behlendorf 2e0a5f5461 Refresh makefiles and configure.ac 2008-12-12 09:30:42 -08:00
Brian Behlendorf 3b4adb0abd Add all autogen products 2008-12-12 09:25:06 -08:00
Brian Behlendorf 983c10c8c1 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 09:23:36 -08:00
Brian Behlendorf 450502ec0b Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-12 09:23:28 -08:00
Brian Behlendorf bc031993d7 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 09:23:08 -08:00
Brian Behlendorf efbf9637d4 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-12 09:23:03 -08:00
Brian Behlendorf 2ad15bb834 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-12 09:22:59 -08:00
Brian Behlendorf 8516e2d45e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 09:22:48 -08:00
Brian Behlendorf fdb922a832 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 09:22:42 -08:00
Brian Behlendorf 7f2347ed6c Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-12 09:22:34 -08:00
Brian Behlendorf c1a800e4c5 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 09:22:19 -08:00
Brian Behlendorf 7005de9a0c Refresh Makefile.am's 2008-12-12 09:20:33 -08:00
Brian Behlendorf 85e026f310 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 08:53:32 -08:00
Brian Behlendorf 06c36a4115 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-12 08:53:24 -08:00
Brian Behlendorf 370d47306c Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 08:53:03 -08:00
Brian Behlendorf c87484ff9a Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-12 08:52:58 -08:00
Brian Behlendorf 5522b00069 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-12 08:52:54 -08:00
Brian Behlendorf 86b3bb18c3 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 08:52:43 -08:00
Brian Behlendorf 6955ffc56e Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 08:52:37 -08:00
Brian Behlendorf 579ce8f9b7 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-12 08:52:28 -08:00
Brian Behlendorf 9e66117d33 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 08:52:13 -08:00
Brian Behlendorf d4ae03c700 Add initial stub makefile, details need filling in 2008-12-12 08:50:07 -08:00
Brian Behlendorf 30c38654e4 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-11 16:49:42 -08:00
Brian Behlendorf 3540a5e4e5 Readd 2008-12-11 16:46:07 -08:00
Brian Behlendorf e0104bd422 Remove so they can be easily readded 2008-12-11 16:41:23 -08:00
Brian Behlendorf a5ea185d73 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-11 16:35:33 -08:00
Brian Behlendorf e7ffc42caf Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-11 16:35:24 -08:00
Brian Behlendorf 9f20c1541f Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-11 16:34:42 -08:00
Brian Behlendorf 028e88ac61 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-11 16:34:34 -08:00
Brian Behlendorf 2ae6a4865f Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-11 16:34:25 -08:00
Brian Behlendorf c95fabb9c7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 16:33:58 -08:00
Brian Behlendorf fe1de9437c Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-11 16:33:44 -08:00
Brian Behlendorf 5fd7f8a200 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-11 16:33:28 -08:00
Brian Behlendorf a0914f2770 Refresh 2008-12-11 16:31:44 -08:00
Brian Behlendorf a928ca95fc Add to Makefile.am 2008-12-11 16:25:33 -08:00
Brian Behlendorf 9eb741a1fe Readd missing header 2008-12-11 16:23:35 -08:00
Brian Behlendorf a0e625a878 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-11 15:41:52 -08:00
Brian Behlendorf 182754d11a Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 15:41:48 -08:00
Brian Behlendorf d35a0f25fe Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-11 15:41:45 -08:00
Brian Behlendorf dd32efe6ef Resolve conflict 2008-12-11 15:41:42 -08:00
Brian Behlendorf b8224d752e Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-11 15:41:29 -08:00
Brian Behlendorf 7e85cefdc5 Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2008-12-11 15:41:28 -08:00
Brian Behlendorf d8ab98ca3c Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2008-12-11 15:41:23 -08:00
Brian Behlendorf 1ccd0b2b09 Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads 2008-12-11 15:40:37 -08:00
Brian Behlendorf aa42812a3d Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2008-12-11 15:40:32 -08:00
Brian Behlendorf 3751fd87e3 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2008-12-11 15:40:25 -08:00
Brian Behlendorf 57799b7b5a Resolve conflict 2008-12-11 15:40:14 -08:00
Brian Behlendorf 3399113552 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-11 15:39:25 -08:00
Brian Behlendorf 6b2c60acca Moving lib/libspl to linux-libspl branch 2008-12-11 15:38:59 -08:00
Brian Behlendorf 1d99f33ba7 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-11 15:37:37 -08:00
Brian Behlendorf 28c80747e6 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-11 15:37:29 -08:00
Brian Behlendorf c2ccbc5a94 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-11 15:37:10 -08:00
Brian Behlendorf b4e3a4f70d Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-11 15:37:06 -08:00
Brian Behlendorf 98e19f56b5 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-11 15:37:02 -08:00
Brian Behlendorf e24a59a697 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 15:36:51 -08:00
Brian Behlendorf f3dc282dd1 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-11 15:36:45 -08:00
Brian Behlendorf ee17768d94 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-11 15:36:38 -08:00
Brian Behlendorf 2b86faed0a Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-11 15:36:23 -08:00
Brian Behlendorf cf06f2f58f Whoops put these back 2008-12-11 15:34:32 -08:00
Brian Behlendorf 652388f3fb Moving all lib/libspl contexts to linux-libspl branch 2008-12-11 15:31:48 -08:00
Brian Behlendorf 9245824527 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-11 15:08:23 -08:00
Brian Behlendorf d46b60f374 Move libspl to new location 2008-12-11 15:06:34 -08:00
Brian Behlendorf be5e4ee04f Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-11 15:00:50 -08:00
Brian Behlendorf 686c93db12 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-11 15:00:23 -08:00
Brian Behlendorf 477a85d905 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-11 15:00:01 -08:00
Brian Behlendorf 6d37a4ad97 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-11 14:59:57 -08:00
Brian Behlendorf d68cecbb9d Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-11 14:59:52 -08:00
Brian Behlendorf 515c1981f2 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 14:59:39 -08:00
Brian Behlendorf f46d4ce0a4 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-11 14:59:32 -08:00
Brian Behlendorf f27584417a Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-11 14:59:24 -08:00
Brian Behlendorf a3c66a6b89 Resolve conflict 2008-12-11 14:58:34 -08:00
Brian Behlendorf 593aa3e10d Move all current Makefiles to correct locations, updates still needed 2008-12-11 14:55:55 -08:00
Brian Behlendorf a4a44a76d4 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-11 14:27:09 -08:00
Brian Behlendorf a11327542c Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-11 14:26:58 -08:00
Brian Behlendorf 2bcfa6809c Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-11 14:26:34 -08:00
Brian Behlendorf 4ebd4f1f00 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-11 14:26:29 -08:00
Brian Behlendorf 45ea2016b4 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-11 14:26:24 -08:00
Brian Behlendorf 8f8a7e587a Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 14:26:10 -08:00
Brian Behlendorf c5c9d459a5 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-11 14:26:03 -08:00
Brian Behlendorf b2e6f14250 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-11 14:25:53 -08:00
Brian Behlendorf 3bd537afcc Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-11 14:25:35 -08:00
Brian Behlendorf 503068ecec Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-11 14:25:32 -08:00
Brian Behlendorf 6bc8988bec Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads 2008-12-11 14:25:21 -08:00
Brian Behlendorf 13d572f7bc Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2008-12-11 14:25:15 -08:00
Brian Behlendorf 1e849d9b3b Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2008-12-11 14:25:08 -08:00
Brian Behlendorf b8294b1311 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 14:25:05 -08:00
Brian Behlendorf 022db7f816 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-11 14:25:01 -08:00
Brian Behlendorf ec2b4ef2ed Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2008-12-11 14:24:59 -08:00
Brian Behlendorf 9af6637db5 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-11 14:24:57 -08:00
Brian Behlendorf c325ac879c Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2008-12-11 14:24:56 -08:00
Brian Behlendorf 3e2988aa8b Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2008-12-11 14:24:50 -08:00
Brian Behlendorf 82c8f9af50 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 14:24:49 -08:00
Brian Behlendorf 9b3c631dbd Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-11 14:24:48 -08:00
Brian Behlendorf a4076c7544 Script updates 2008-12-11 14:21:14 -08:00
Brian Behlendorf c4911ece24 Move library files to lib 2008-12-11 14:16:55 -08:00
Brian Behlendorf a400443ecf Resolve conflict 2008-12-11 14:07:08 -08:00
Brian Behlendorf 8ca859a47b Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-11 14:05:44 -08:00
Brian Behlendorf 31927647a8 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-11 14:05:18 -08:00
Brian Behlendorf b9c746ed0b Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-11 14:05:13 -08:00
Brian Behlendorf fdff27558a Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-11 14:05:08 -08:00
Brian Behlendorf 94e1055395 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 14:04:54 -08:00
Brian Behlendorf 4d8fd75005 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-11 14:04:46 -08:00
Brian Behlendorf 3ab9fee91c Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-11 14:04:35 -08:00
Brian Behlendorf 44ffa43709 Resolve conflict 2008-12-11 14:01:47 -08:00
Brian Behlendorf 98ce19f04c Update avl, nvpair, spl to unique build dirs 2008-12-11 13:54:57 -08:00
Brian Behlendorf 8b20091dda Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-11 11:47:54 -08:00
Brian Behlendorf 645c51287f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-11 11:37:35 -08:00
Brian Behlendorf 11e1ce8c2e Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-11 11:36:50 -08:00
Brian Behlendorf 076f7c6a5f Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-11 11:36:40 -08:00
Brian Behlendorf 7515df142f Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-11 11:36:31 -08:00
Brian Behlendorf 5bb8f9ec25 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 11:36:00 -08:00
Brian Behlendorf 4003bc5b2c Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-11 11:35:48 -08:00
Brian Behlendorf 1b0348e335 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-11 11:35:29 -08:00
Brian Behlendorf aca9d98817 Fix conflict 2008-12-11 11:34:16 -08:00
Brian Behlendorf f07f82e93a Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads 2008-12-11 11:26:43 -08:00
Brian Behlendorf 3053990c38 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2008-12-11 11:26:19 -08:00
Brian Behlendorf 84e65c5c1e Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2008-12-11 11:25:50 -08:00
Brian Behlendorf 756a122d37 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 11:25:42 -08:00
Brian Behlendorf d6ccbb14c5 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-11 11:25:28 -08:00
Brian Behlendorf ff282a978f Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2008-12-11 11:25:22 -08:00
Brian Behlendorf cdd670cb2f Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-11 11:25:15 -08:00
Brian Behlendorf 8f8ac4288f Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2008-12-11 11:25:09 -08:00
Brian Behlendorf b342e90e44 Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2008-12-11 11:24:51 -08:00
Brian Behlendorf 4f5d567cfd Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 11:24:45 -08:00
Brian Behlendorf 3420896332 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-11 11:24:42 -08:00
Brian Behlendorf b453b61272 Fix libspl move to the wrong place 2008-12-11 11:22:02 -08:00
Brian Behlendorf 77755a5771 Add a few missing files 2008-12-11 11:14:49 -08:00
Brian Behlendorf 172bb4bd5e Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00
Brian Behlendorf b6097ae55a Remove stray stub kernel files which should be brought in my linux-kernel-module patch 2008-12-02 08:47:21 -08:00
Brian Behlendorf 34dc7c2f25 Initial Linux ZFS GIT Repo 2008-11-20 12:01:55 -08:00