Commit Graph

195 Commits

Author SHA1 Message Date
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 9c2bf69ecb Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 12:40:25 -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 3ee9de49fe Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-05 12:11:12 -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 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 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 1786fcf52f Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-23 13:49:59 -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 de6b729e33 Add Makefile tweak 2008-12-23 13:44:15 -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 f49886c003 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-23 13:13:29 -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 c8a87608d6 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-23 12:51:12 -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 0dfd5ebee8 module/zcommon/Makefile.in 2008-12-23 12:47:03 -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 82cd3659a2 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-23 11:49:58 -08:00
Brian Behlendorf 5a0a9cc451 Update makefiles 2008-12-23 11:47:33 -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 1f72057409 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 13:51:57 -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 3f5f22eab0 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-22 13:35:12 -08:00
Brian Behlendorf 46badfb03b Only allow this for the kernel 2008-12-22 13:33:06 -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 187be3051e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 11:41:27 -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 09de417e20 Move #endif up to expose userspace bits 2008-12-22 11:01:35 -08:00
Brian Behlendorf c6e93310af Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-22 10:37:00 -08:00
Brian Behlendorf bdbd91fe46 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 10:36:48 -08:00
Brian Behlendorf 10911f9d71 Add missing sources 2008-12-22 10:27:41 -08:00
Brian Behlendorf 3f0c49cfa4 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 16:34:38 -08:00
Brian Behlendorf cbc70456f1 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 16:34:10 -08:00
Brian Behlendorf 96813619bf Pull in new background scrubber 2008-12-19 16:29:13 -08:00
Brian Behlendorf 6f272feaa8 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 13:48:05 -08:00
Brian Behlendorf 5cd3d5fe3f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 13:47:53 -08:00
Brian Behlendorf 1b2a1a31bb Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 13:47:20 -08:00
Brian Behlendorf b5e4bf3731 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 13:47:19 -08:00
Brian Behlendorf 8161b781a1 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 13:47:18 -08:00
Brian Behlendorf 89bd2100e7 Resolve a few more c90 issues 2008-12-19 13:45:24 -08:00
Brian Behlendorf df4782cf3b Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 12:38:48 -08:00