Commit Graph

69 Commits

Author SHA1 Message Date
Brian Behlendorf a9bfb78b5a Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-05 13:46:47 -08:00
Brian Behlendorf 3bc01c0326 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 13:46:35 -08:00
Brian Behlendorf c15fa0ceb0 Add include paths 2009-01-05 13:44:26 -08:00
Brian Behlendorf 8f160abede Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-16 16:36:39 -08:00
Brian Behlendorf 8ffad5b6c0 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 16:35:57 -08:00
Brian Behlendorf 7453ec0f2c Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 16:34:09 -08:00
Brian Behlendorf 8bed8da925 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 16:34:07 -08:00
Brian Behlendorf 2d7f255945 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 16:34:04 -08:00
Brian Behlendorf ebab24f633 Resolve shadow conflict 2008-12-16 16:26:50 -08:00
Brian Behlendorf a56dee01f5 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-16 16:21:17 -08:00
Brian Behlendorf 94dd45c46d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 16:20:54 -08:00
Brian Behlendorf f2bc2f7b6f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 16:19:52 -08:00
Brian Behlendorf fd4da48000 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 16:19:50 -08:00
Brian Behlendorf 29be0d44ba Resolve conflict 2008-12-16 16:19:46 -08:00
Brian Behlendorf 4d21a1c977 Resolve two more shadow conflicts 2008-12-16 16:14:19 -08:00
Brian Behlendorf afc91005b1 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-16 15:52:06 -08:00
Brian Behlendorf cc53801767 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 15:51:54 -08:00
Brian Behlendorf 12c13fbafb Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 15:51:20 -08:00
Brian Behlendorf 4583b6d5ba Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 15:51:19 -08:00
Brian Behlendorf e14e140b52 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 15:51:19 -08:00
Brian Behlendorf 3c515284a6 Remove double declaration of char * 2008-12-16 15:49:21 -08:00
Brian Behlendorf f73c835830 Add include patch to pick up fletcher.c which for some unknown reason is included instead of simply being build as source. This should be fixed eventually, but it is how the OpenSolaris source handles it. 2008-12-16 15:44:02 -08:00
Brian Behlendorf 5840198e26 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-16 14:34:43 -08:00
Brian Behlendorf a4c93e56cc Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 14:34:31 -08:00
Brian Behlendorf 79bc1b23ed Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 14:33:59 -08:00
Brian Behlendorf 804830a231 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 14:33:59 -08:00
Brian Behlendorf a8a0f9ea2a Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 14:33:58 -08:00
Brian Behlendorf 53c0cdbc42 Resolve dirname shadow conflict with /usr/include/libgen.h:27 dirname 2008-12-16 14:29:35 -08:00
Brian Behlendorf 2f68235cc8 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-16 13:31:04 -08:00
Brian Behlendorf 751ee4041e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 13:30:53 -08:00
Brian Behlendorf 527e38c72b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 13:30:21 -08:00
Brian Behlendorf 34b937c016 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 13:30:21 -08:00
Brian Behlendorf f693a600d0 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 13:30:20 -08:00
Brian Behlendorf 206a3ac58c Resolve 2 more shadow conflicts 2008-12-16 13:28:23 -08:00
Brian Behlendorf 4a52a4dfb1 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-16 13:22:07 -08:00
Brian Behlendorf d54cedd16c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 13:21:55 -08:00
Brian Behlendorf 60ad9afc28 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 13:21:23 -08:00
Brian Behlendorf 5af8235e41 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 13:21:23 -08:00
Brian Behlendorf f82621d7cb Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 13:19:26 -08:00
Brian Behlendorf 5383875500 Create gcc-shadow branch 2008-12-16 13:19:01 -08:00
Brian Behlendorf 9fabbb14ad Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-16 09:04:35 -08:00
Brian Behlendorf ef55a13da8 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 09:04:03 -08:00
Brian Behlendorf a7b063d224 Add DEFAULT_INCLUDE to rules, adjust = to += accordingly 2008-12-16 08:58:41 -08:00
Brian Behlendorf a74ec0ff24 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-12 15:07:24 -08:00
Brian Behlendorf 54cb07032d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 15:07:12 -08:00
Brian Behlendorf d145044d80 Refresh Makefile 2008-12-12 15:04:48 -08:00
Brian Behlendorf 1e0ff074a9 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-12 14:57:03 -08:00
Brian Behlendorf f5a62035c7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 14:56:50 -08:00
Brian Behlendorf f154348ca9 Update Makefile 2008-12-12 14:52:43 -08:00
Brian Behlendorf 52044a9601 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-12 14:44:21 -08:00