Commit Graph

18362 Commits

Author SHA1 Message Date
Brian Behlendorf 7c5dac1954 Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 2010-05-18 14:33:14 -07:00
Brian Behlendorf 4610b5b39c Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2010-05-18 14:33:13 -07:00
Brian Behlendorf 8f1b7b5022 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2010-05-18 14:33:13 -07:00
Brian Behlendorf e9e64f88ca Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-05-18 14:33:08 -07:00
Brian Behlendorf fcbc88d34b Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2010-05-18 14:33:07 -07:00
Brian Behlendorf 36cb411075 Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch 2010-05-18 14:33:07 -07:00
Brian Behlendorf 17173476aa Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source 2010-05-18 14:33:06 -07:00
Brian Behlendorf bd7197fd0b Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2010-05-18 14:33:04 -07:00
Brian Behlendorf d0680b8155 Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces 2010-05-18 14:33:03 -07:00
Brian Behlendorf a6a29acd23 Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2010-05-18 14:33:01 -07:00
Brian Behlendorf da79ba3c6d Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas 2010-05-18 14:33:00 -07:00
Brian Behlendorf 6837738a53 Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch 2010-05-18 14:32:58 -07:00
Brian Behlendorf c3902f6ef3 Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants 2010-05-18 14:32:57 -07:00
Brian Behlendorf 0bf742359a Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2010-05-18 14:32:55 -07:00
Brian Behlendorf c8da3bb68b Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow 2010-05-18 14:32:54 -07:00
Brian Behlendorf cf7a3c4af2 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2010-05-18 14:32:52 -07:00
Brian Behlendorf 02ae622925 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2010-05-18 14:32:51 -07:00
Brian Behlendorf ddb9f06d75 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2010-05-18 14:32:49 -07:00
Brian Behlendorf ce10342dd9 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2010-05-18 14:32:48 -07:00
Brian Behlendorf 62c14ca4ca Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2010-05-18 14:32:46 -07:00
Brian Behlendorf 9a8060d6f5 Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2010-05-18 14:32:45 -07:00
Brian Behlendorf 91fce49b3b Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2010-05-18 14:32:43 -07:00
Brian Behlendorf d16fe106c2 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2010-05-18 14:32:41 -07:00
Brian Behlendorf 4d145474b3 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2010-05-18 14:32:39 -07:00
Brian Behlendorf ca357527f5 Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2010-05-18 14:32:38 -07:00
Brian Behlendorf 86b3826fdd Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2010-05-18 14:32:37 -07:00
Brian Behlendorf 2ce4f1a664 Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2010-05-18 14:32:35 -07:00
Brian Behlendorf 7f2abf3598 Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2010-05-18 14:32:34 -07:00
Brian Behlendorf 720315c047 Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2010-05-18 14:32:32 -07:00
Brian Behlendorf 5a6dfc1799 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2010-05-18 14:32:30 -07:00
Brian Behlendorf 888c4e84da Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2010-05-18 14:32:28 -07:00
Brian Behlendorf 2a60b16620 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2010-05-18 14:32:27 -07:00
Brian Behlendorf f7f7cdbfee Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2010-05-18 14:32:25 -07:00
Brian Behlendorf fa94cf43b9 Update COPYRIGHT to reference zpios CDDL exceptions. 2010-05-18 14:25:28 -07:00
Brian Behlendorf 630ce17804 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-05-18 14:23:08 -07:00
Brian Behlendorf 86f961b310 Update all zpios related headers for consistency and correctness. 2010-05-18 14:18:09 -07:00
Brian Behlendorf ae9ef8987f Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-05-18 13:42:34 -07:00
Brian Behlendorf c98946e318 Add missing CDDL headers. 2010-05-18 13:38:06 -07:00
Brian Behlendorf c5004e8fb1 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-05-18 12:53:04 -07:00
Brian Behlendorf 2a80af91ed Remove nvpair_alloc_system.c change in libspl topic branch.
A change to the nvpair implementation should not have been made in
the libspl-topic branch.  This patch fixes that accident by reverting
the change and providing the missing libspl header to allow the
proper building of nvpair_alloc_system.c without the need to modify it.
2010-05-18 12:47:08 -07:00
Brian Behlendorf 36cc7b6257 Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 2010-05-18 12:33:25 -07:00
Brian Behlendorf df0b1319af Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-18 12:33:23 -07:00
Brian Behlendorf 2fd07e9b86 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-05-18 12:33:23 -07:00
Brian Behlendorf b6a33b0865 Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-05-18 12:33:08 -07:00
Brian Behlendorf 55852e36b0 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-05-18 12:33:06 -07:00
Brian Behlendorf c1feaa2ef4 Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-05-18 12:32:59 -07:00
Brian Behlendorf 1004947023 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-05-18 12:32:57 -07:00
Brian Behlendorf cd3ffcafd4 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-05-18 12:32:49 -07:00
Brian Behlendorf 619efe1f74 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-05-18 12:32:47 -07:00
Brian Behlendorf 067a16c51e Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-05-18 12:32:40 -07:00