Commit Graph

737 Commits

Author SHA1 Message Date
Brian Behlendorf 574f1ecfec Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-06 09:03:57 -08:00
Brian Behlendorf 3013823bbe Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-06 09:03:44 -08:00
Brian Behlendorf bb6a56e778 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-06 09:03:39 -08:00
Brian Behlendorf 1c496f0235 Refresh exported spa_config symbols 2009-01-06 08:59:36 -08:00
Brian Behlendorf 3e9ecdb05d Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-06 08:44:14 -08:00
Brian Behlendorf 4522c570e8 Add missing prototype 2009-01-06 08:39:45 -08:00
Brian Behlendorf 37fbec5b71 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-05 16:59:36 -08:00
Brian Behlendorf 554e66717b Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-05 16:59:30 -08:00
Brian Behlendorf 23ea9e6a3a Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-05 16:59:07 -08:00
Brian Behlendorf e7f04030d2 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-05 16:59:02 -08:00
Brian Behlendorf 90ff526841 Remove symbol exports no longer needed with the dsl scrub rewrite 2009-01-05 16:55:15 -08:00
Brian Behlendorf 3a1f0dcde1 Refresh prototype due to upstream changes 2009-01-05 16:53:23 -08:00
Brian Behlendorf ec5f706c33 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-05 16:41:42 -08:00
Brian Behlendorf e3bb3d635d Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-05 16:41:09 -08:00
Brian Behlendorf ef1c43e66f Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-05 16:40:14 -08:00
Brian Behlendorf 8c5d486797 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-05 16:40:03 -08:00
Brian Behlendorf 3283dd9715 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-05 16:39:54 -08:00
Brian Behlendorf a4d96d5c16 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-05 16:39:28 -08:00
Brian Behlendorf d763974558 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 16:39:26 -08:00
Brian Behlendorf 4d6969d387 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-05 16:38:12 -08:00
Brian Behlendorf c92ab39541 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-05 16:38:08 -08:00
Brian Behlendorf 9d4d588938 Comment out until ZPL implemented 2009-01-05 16:34:01 -08:00
Brian Behlendorf 163d99cd44 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-05 16:00:47 -08:00
Brian Behlendorf 154d07bd96 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-05 16:00:36 -08:00
Brian Behlendorf 995a374126 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-05 16:00:32 -08:00
Brian Behlendorf 76d40e2e81 Update exported symbols 2009-01-05 15:58:50 -08:00
Brian Behlendorf ce50f2053c Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-05 15:45:59 -08:00
Brian Behlendorf 24565e3301 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-05 15:45:46 -08:00
Brian Behlendorf bb747a10de Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-05 15:45:25 -08:00
Brian Behlendorf 67c9f22507 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-05 15:45:21 -08:00
Brian Behlendorf 407eef59dd Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-05 15:45:17 -08:00
Brian Behlendorf f3eeb1c19b Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-05 15:45:07 -08:00
Brian Behlendorf dbc3840c65 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-05 15:45:06 -08:00
Brian Behlendorf b2db87f254 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 15:45:05 -08:00
Brian Behlendorf 4b9683dcf7 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-05 15:44:35 -08:00
Brian Behlendorf 7c992011a1 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-05 15:44:33 -08:00
Brian Behlendorf 760d78b9f8 Move default include paths after custom include paths so local stuff gets picked up first 2009-01-05 15:42:56 -08:00
Brian Behlendorf 4c741b2f9d Revert changes and resolve include issue by adjusting include path ordering 2009-01-05 15:40:56 -08:00
Brian Behlendorf d28280dd17 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-05 15:21:24 -08:00
Brian Behlendorf 96989f8b00 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-05 15:21:14 -08:00
Brian Behlendorf ab0b7157d5 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-05 15:21:12 -08:00
Brian Behlendorf eb58273a29 Update exported symbol names for new traversal code 2009-01-05 15:19:35 -08:00
Brian Behlendorf bd81e10fbf Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-05 14:29:27 -08:00
Brian Behlendorf e85775aeaa Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-05 14:29:14 -08:00
Brian Behlendorf a1dc943c32 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-05 14:28:53 -08:00
Brian Behlendorf c31e0e9e89 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-05 14:28:49 -08:00
Brian Behlendorf 48fa5d6c8f Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-05 14:28:44 -08:00
Brian Behlendorf 86a7a82c2d Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-05 14:28:34 -08:00
Brian Behlendorf ec462ce48f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 14:28:33 -08:00
Brian Behlendorf 79a46ae86d Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-05 14:28:02 -08:00
Brian Behlendorf 1ab1e16285 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-05 14:28:01 -08:00
Brian Behlendorf a4ecacdad7 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-05 14:28:00 -08:00
Brian Behlendorf 93e72d1102 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-05 14:27:59 -08:00
Brian Behlendorf 854fda6d70 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-01-05 14:27:58 -08:00
Brian Behlendorf 12ee6d57c8 Avoid using { 0 } assignment because it assume certain things about the condvar and mutex typedefs which may not be true 2009-01-05 14:26:16 -08:00
Brian Behlendorf fcacccfb25 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-05 14:13:59 -08:00
Brian Behlendorf e25fab9985 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-05 14:13:50 -08:00
Brian Behlendorf 2ec61316a8 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-05 14:13:48 -08:00
Brian Behlendorf d8f9597730 Always include u8_textprep 2009-01-05 14:12:03 -08:00
Brian Behlendorf 6efd309371 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-05 13:59:14 -08:00
Brian Behlendorf 49e679bb6d Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-05 13:59:05 -08:00
Brian Behlendorf 90531ed597 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-05 13:59:03 -08:00
Brian Behlendorf 0c9de0c356 Linux kernel modularize unicode 2009-01-05 13:57:26 -08:00
Brian Behlendorf 35cfc1bb85 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-05 12:45:38 -08:00
Brian Behlendorf 0e00972b2a Resolve conflict 2009-01-05 12:42:30 -08:00
Brian Behlendorf 144eca0e84 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-05 12:41:04 -08:00
Brian Behlendorf d5350109f4 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-05 12:40:55 -08:00
Brian Behlendorf 6ce317a8d5 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-05 12:40:48 -08:00
Brian Behlendorf 1dd185c19d Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-05 12:40:26 -08:00
Brian Behlendorf 9c2bf69ecb Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 12:40:25 -08:00
Brian Behlendorf 9a0cb95b1b Resolve conflict 2009-01-05 12:38:23 -08:00
Brian Behlendorf 9e7be26939 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-05 12:36:21 -08:00
Brian Behlendorf ce7115b807 Add unicode makefile references and support 2009-01-05 12:33:09 -08:00
Brian Behlendorf ced77c2f1b Add unicode makefile references and support 2009-01-05 12:32:55 -08:00
Brian Behlendorf 7a14126594 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-05 12:13:07 -08:00
Brian Behlendorf ddcdf90ceb Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-05 12:12:33 -08:00
Brian Behlendorf bde3267f84 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-05 12:11:36 -08:00
Brian Behlendorf cd566dec4e Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-05 12:11:24 -08:00
Brian Behlendorf 3ee9de49fe Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-05 12:11:12 -08:00
Brian Behlendorf c7907319d9 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-05 12:10:40 -08:00
Brian Behlendorf 1c1ec8cce6 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 12:10:37 -08:00
Brian Behlendorf 888028c161 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-05 12:09:13 -08:00
Brian Behlendorf 321bc5b04a Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-05 12:09:09 -08:00
Brian Behlendorf 07c6176130 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-05 12:09:06 -08:00
Brian Behlendorf 39b3a6a12d Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-05 12:08:11 -08:00
Brian Behlendorf a22f3a712d Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2009-01-05 12:07:58 -08:00
Brian Behlendorf d09ef994e7 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2009-01-05 12:07:48 -08:00
Brian Behlendorf 5a7a00f67c Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2009-01-05 12:07:30 -08:00
Brian Behlendorf 7d4ccef58f Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-05 12:07:27 -08:00
Brian Behlendorf cdfd10ba79 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2009-01-05 12:07:25 -08:00
Brian Behlendorf 42bcb36c89 Add unicode library 2009-01-05 12:03:23 -08:00
Brian Behlendorf 9d827ae691 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-23 16:36:37 -08:00
Brian Behlendorf ae960c7bbc This doesn't quite work with the SPL yet 2008-12-23 16:32:42 -08:00
Brian Behlendorf 4dc3268de4 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-23 16:13:36 -08:00
Brian Behlendorf cb740a3631 Linux ARC integration unimplemented 2008-12-23 16:09:45 -08:00
Brian Behlendorf 99c1689f45 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2008-12-23 13:50:46 -08:00
Brian Behlendorf 4a0b1e550a Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-23 13:50:31 -08:00
Brian Behlendorf 6f596265c6 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-23 13:50:08 -08:00
Brian Behlendorf 55dd786189 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-23 13:50:03 -08:00
Brian Behlendorf 1786fcf52f Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-23 13:49:59 -08:00
Brian Behlendorf d92640af02 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-23 13:49:56 -08:00
Brian Behlendorf 0a963fa1b8 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-23 13:49:54 -08:00
Brian Behlendorf 6b88c17a8f Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-23 13:49:54 -08:00
Brian Behlendorf 8d0db59e56 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-23 13:49:47 -08:00
Brian Behlendorf 39953e7eb3 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-23 13:49:47 -08:00
Brian Behlendorf b491d69122 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-23 13:49:15 -08:00
Brian Behlendorf ffb8773241 Take out page map functions for now 2008-12-23 13:47:22 -08:00
Brian Behlendorf de6b729e33 Add Makefile tweak 2008-12-23 13:44:15 -08:00
Brian Behlendorf 5c0c083ad9 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2008-12-23 13:14:27 -08:00
Brian Behlendorf ad75ceca9b Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-23 13:14:13 -08:00
Brian Behlendorf c2f93a61e2 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-23 13:13:51 -08:00
Brian Behlendorf 7539a5da86 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-23 13:13:46 -08:00
Brian Behlendorf 30c88a0708 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-23 13:13:42 -08:00
Brian Behlendorf 4177b4715d Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-23 13:13:37 -08:00
Brian Behlendorf 642a64b7bd Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-23 13:13:37 -08:00
Brian Behlendorf 028f170442 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-23 13:13:32 -08:00
Brian Behlendorf 57048fa6fa Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-23 13:13:30 -08:00
Brian Behlendorf f49886c003 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-23 13:13:29 -08:00
Brian Behlendorf e601754f7c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-23 13:12:57 -08:00
Brian Behlendorf 7725fe7431 Remove CPU_SEQID from context, available in SPL. Additionally add module magic for zcommon 2008-12-23 13:11:03 -08:00
Brian Behlendorf e7e0111a7c Update makefile 2008-12-23 13:07:27 -08:00
Brian Behlendorf fe5632dac0 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2008-12-23 12:51:59 -08:00
Brian Behlendorf 2b8a76731b Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-23 12:51:45 -08:00
Brian Behlendorf 971e4cca83 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-23 12:51:21 -08:00
Brian Behlendorf ef8ca905d2 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-23 12:51:16 -08:00
Brian Behlendorf c8a87608d6 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-23 12:51:12 -08:00
Brian Behlendorf b4c584906e Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-23 12:51:07 -08:00
Brian Behlendorf 9b3e361b6e Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-23 12:51:06 -08:00
Brian Behlendorf 1d4f536ffd Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-23 12:50:59 -08:00
Brian Behlendorf c22ff325ce Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-23 12:50:58 -08:00
Brian Behlendorf 13dd1298b6 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-23 12:50:24 -08:00
Brian Behlendorf 0dfd5ebee8 module/zcommon/Makefile.in 2008-12-23 12:47:03 -08:00
Brian Behlendorf 72ad2bab17 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2008-12-23 11:50:57 -08:00
Brian Behlendorf d1e7610b2c Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-23 11:50:43 -08:00
Brian Behlendorf 4f98a245f4 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-23 11:50:19 -08:00
Brian Behlendorf 5fe9881ef0 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-23 11:50:15 -08:00
Brian Behlendorf 7c6d905ec3 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-23 11:50:11 -08:00
Brian Behlendorf 1431c8e452 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-23 11:50:06 -08:00
Brian Behlendorf 8209bef3af Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-23 11:50:05 -08:00
Brian Behlendorf ce950dd29f Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-23 11:49:59 -08:00
Brian Behlendorf 82cd3659a2 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-23 11:49:58 -08:00
Brian Behlendorf c95e9a8ce0 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-23 11:49:27 -08:00
Brian Behlendorf 5a0a9cc451 Update makefiles 2008-12-23 11:47:33 -08:00
Brian Behlendorf 4230c743cd Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-23 09:26:10 -08:00
Brian Behlendorf fe119cee57 Minor zpios cleanup 2008-12-23 09:24:19 -08:00
Brian Behlendorf f058190402 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-22 14:54:13 -08:00
Brian Behlendorf b7217f525f Fix typo 2008-12-22 14:52:15 -08:00
Brian Behlendorf 9de781cf03 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2008-12-22 13:53:04 -08:00
Brian Behlendorf 139792e6b2 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2008-12-22 13:53:03 -08:00
Brian Behlendorf bb12ee3ba5 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-22 13:52:47 -08:00
Brian Behlendorf ddb72e5a3d Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-22 13:52:21 -08:00
Brian Behlendorf 262e367cd5 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-22 13:52:16 -08:00
Brian Behlendorf 877699acb1 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-22 13:52:11 -08:00
Brian Behlendorf 8f69262e09 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 13:52:06 -08:00
Brian Behlendorf c93aec7f64 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 13:52:05 -08:00
Brian Behlendorf ca2b6db925 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-22 13:51:58 -08:00
Brian Behlendorf 1f72057409 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 13:51:57 -08:00
Brian Behlendorf 05fafc638f Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 13:51:21 -08:00
Brian Behlendorf 90e5216ea9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 13:51:17 -08:00
Brian Behlendorf 3b93dc4d82 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 13:51:14 -08:00
Brian Behlendorf 3a953fa870 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2008-12-22 13:51:13 -08:00
Brian Behlendorf d684390d3a Just fix a bogus return type 2008-12-22 13:49:15 -08:00
Brian Behlendorf f41626ced6 Make ZPL conditional 2008-12-22 13:46:30 -08:00
Brian Behlendorf 9d731b801b Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2008-12-22 13:35:15 -08:00
Brian Behlendorf f046fb3552 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-22 13:35:14 -08:00
Brian Behlendorf 3f5f22eab0 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-22 13:35:12 -08:00
Brian Behlendorf a9058c38b3 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 13:35:07 -08:00
Brian Behlendorf 9bfe4e627a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 13:35:06 -08:00
Brian Behlendorf 973d4f36ef Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-22 13:35:01 -08:00
Brian Behlendorf 3cdde7ffd9 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-22 13:34:59 -08:00
Brian Behlendorf 46badfb03b Only allow this for the kernel 2008-12-22 13:33:06 -08:00
Brian Behlendorf b17c1f4123 Don't make this fatal for userspace 2008-12-22 13:32:19 -08:00
Brian Behlendorf 05b4b092dc Only required for ZPL builds 2008-12-22 13:31:23 -08:00
Brian Behlendorf bf10d5037a Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-22 12:42:04 -08:00
Brian Behlendorf 2f4b12b228 Add HAVE_ZVOL changes 2008-12-22 12:37:43 -08:00
Brian Behlendorf 1e9c6b3020 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2008-12-22 12:24:47 -08:00
Brian Behlendorf 79491b69f4 Start linux-have-zpl layer 2008-12-22 12:23:27 -08:00
Brian Behlendorf a6d6f31db6 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-22 12:09:08 -08:00
Brian Behlendorf d7d260b870 Removing branch to readd under new name 2008-12-22 12:05:11 -08:00
Brian Behlendorf 3533b7ec8c Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-22 11:58:27 -08:00
Brian Behlendorf 683dc8d98e Fix up headers 2008-12-22 11:54:35 -08:00
Brian Behlendorf 9a57b35c98 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-22 11:42:18 -08:00
Brian Behlendorf 52a84a3394 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-22 11:41:54 -08:00
Brian Behlendorf 7b4bf789e9 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 11:41:50 -08:00
Brian Behlendorf 6d13a998fb Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-22 11:41:45 -08:00
Brian Behlendorf 86392b70ad Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-22 11:41:40 -08:00
Brian Behlendorf b49ce65660 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 11:41:35 -08:00
Brian Behlendorf fa9a05e496 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 11:41:35 -08:00
Brian Behlendorf f9e9bba2a4 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-22 11:41:28 -08:00
Brian Behlendorf 187be3051e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 11:41:27 -08:00
Brian Behlendorf aece7f6822 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 11:40:54 -08:00
Brian Behlendorf 7047bb0678 Add missing files from Makefile.am 2008-12-22 11:36:48 -08:00
Brian Behlendorf 94dac841b6 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-22 11:08:29 -08:00
Brian Behlendorf 72f9288f09 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 11:08:24 -08:00
Brian Behlendorf d51e1b0eeb Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 11:08:23 -08:00
Brian Behlendorf 90ed9826ab Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-22 11:08:18 -08:00
Brian Behlendorf 22f583b0f5 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-22 11:08:17 -08:00
Brian Behlendorf 09de417e20 Move #endif up to expose userspace bits 2008-12-22 11:01:35 -08:00
Brian Behlendorf c73c225a4a Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-22 10:37:37 -08:00
Brian Behlendorf 8126ebe55f Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-22 10:37:14 -08:00