Commit Graph

1377 Commits

Author SHA1 Message Date
Brian Behlendorf b390664792 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 10:37:18 -08:00
Brian Behlendorf 01f8dc1f20 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 10:37:06 -08:00
Brian Behlendorf 76247cc21d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 10:36:34 -08:00
Brian Behlendorf 800463b2ef Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 10:36:33 -08:00
Brian Behlendorf d9cd04fc35 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-19 10:36:33 -08:00
Brian Behlendorf 7e159c86a3 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 10:36:32 -08:00
Brian Behlendorf 294ebb7537 Fix C90 for(int i;;;) compliance issues 2008-12-19 10:34:41 -08:00
Brian Behlendorf 434356f979 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 10:27:02 -08:00
Brian Behlendorf f1ba2464f9 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 10:26:50 -08:00
Brian Behlendorf e3815b6d3f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 10:26:18 -08:00
Brian Behlendorf e312737766 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 10:26:18 -08:00
Brian Behlendorf 635d4e5e71 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-19 10:26:17 -08:00
Brian Behlendorf b66929fe90 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-19 10:26:17 -08:00
Brian Behlendorf 5ee6377759 Fix missing void in prototype 2008-12-19 10:24:26 -08:00
Brian Behlendorf 42e7e0b017 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 10:19:07 -08:00
Brian Behlendorf a577858f33 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 10:18:53 -08:00
Brian Behlendorf 9de4108779 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 10:18:12 -08:00
Brian Behlendorf 3e2e5c4535 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-19 10:18:12 -08:00
Brian Behlendorf 88251643d7 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-19 10:18:11 -08:00
Brian Behlendorf a68af79057 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-19 10:18:11 -08:00
Brian Behlendorf d4c39af7a6 Re-add KM_PUSHPAGE 2008-12-19 10:15:52 -08:00
Brian Behlendorf 330840ff2e Re-add KM_PUSHPAGE 2008-12-19 10:15:27 -08:00
Brian Behlendorf 9a20c1615b Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 09:53:52 -08:00
Brian Behlendorf 1a0d43ceac Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 09:53:37 -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 23d1835844 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-19 09:52:51 -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 d57671e03a Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-18 14:00:19 -08:00
Brian Behlendorf 68418e26b8 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 14:00:05 -08:00
Brian Behlendorf fa020b0f7e Remove -Wshadow for now 2008-12-18 13:57:27 -08:00
Brian Behlendorf 4b7319cd19 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-18 13:53:14 -08:00
Brian Behlendorf ef0739a21d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 13:52:59 -08:00
Brian Behlendorf 433b5c8023 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 13:52:17 -08:00
Brian Behlendorf 532525be3a Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-18 13:52:16 -08:00
Brian Behlendorf 93bc33a39e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 13:52:16 -08:00
Brian Behlendorf 23e30eeec9 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-18 13:52:15 -08:00
Brian Behlendorf 6cccf01d35 Missed needed drc var 2008-12-18 13:50:12 -08:00
Brian Behlendorf 2543240d85 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-18 13:44:11 -08:00
Brian Behlendorf 07901e75cc Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 13:43:58 -08:00
Brian Behlendorf bab7f42832 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 13:43:20 -08:00
Brian Behlendorf d6c4c3cce2 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-18 13:43:19 -08:00
Brian Behlendorf 5ce7826ab4 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 13:43:19 -08:00
Brian Behlendorf 732fe6a75f Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-18 13:43:19 -08:00
Brian Behlendorf 973a9d5a79 Resolve drr shadow by breaking hunk in to a new function, which is just cleaner anyway 2008-12-18 13:41:21 -08:00
Brian Behlendorf 3ed3a6d46e Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-18 13:27:27 -08:00
Brian Behlendorf fea7eb9fe4 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 13:27:14 -08:00