Commit Graph

1248 Commits

Author SHA1 Message Date
Brian Behlendorf 804830a231 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 14:33:59 -08:00
Brian Behlendorf fb3d1c555a Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-16 14:33:58 -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 c4a3495d90 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-16 13:30:54 -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 e46311c1e0 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-16 13:30:20 -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 265b0c920e Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-16 13:21:56 -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 f276d3eebc Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-16 13:19:26 -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 1cc99f79a3 New TopGit dependency: gcc-shadow 2008-12-16 13:19:25 -08:00
Brian Behlendorf 5383875500 Create gcc-shadow branch 2008-12-16 13:19:01 -08:00
Brian Behlendorf 11fc60303f Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-16 09:04:07 -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 cf3c0c4bdc Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-15 16:54:37 -08:00
Brian Behlendorf acf0981efc Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-15 16:54:36 -08:00
Brian Behlendorf cc420402bf Moving addition configure checks to m4 macros 2008-12-15 16:46:34 -08:00
Brian Behlendorf 5279cd9c18 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-15 16:35:35 -08:00
Brian Behlendorf 5b92804928 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-15 16:35:33 -08:00
Brian Behlendorf 2712912cb8 Use old autoconf stratagy 2008-12-15 16:27:22 -08:00
Brian Behlendorf f42b935bc0 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-15 10:45:41 -08:00
Brian Behlendorf ac9698d207 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-15 10:45:41 -08:00
Brian Behlendorf 574e2cec0d Minor context change to ease merging 2008-12-15 10:41:15 -08:00
Brian Behlendorf 2bdf9cfae3 Moving all kernel+user configure magic to the correct topic branches where the features are introduced or needed 2008-12-15 10:40:22 -08:00
Brian Behlendorf b78521e53b Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-15 10:30:45 -08:00
Brian Behlendorf 3677154415 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-15 10:30:45 -08:00
Brian Behlendorf e631cff898 Remove lustre config, we really shouldn't need this. A user space build -should- be able to contain all the needed APIs. If this is not the case we can reintroduce this. 2008-12-15 10:28:14 -08:00
Brian Behlendorf 1264e75515 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-12 16:27:43 -08:00
Brian Behlendorf 23302f57aa Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 16:27:40 -08:00
Brian Behlendorf 0e8ac26fc9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-12 16:23:07 -08:00
Brian Behlendorf 08a8860091 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-12 16:23:04 -08:00
Brian Behlendorf acfdfe6ed7 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-12 16:23:01 -08:00
Brian Behlendorf eee73dd80e Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-12 16:22:59 -08:00
Brian Behlendorf d0c573f27e Add in the reset of the pthread changes 2008-12-12 16:16:06 -08:00
Brian Behlendorf 03afba43b4 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-12 15:07:13 -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 5078d8b16d Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-12 14:56:51 -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 46466ff04e Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-12 14:44:09 -08:00
Brian Behlendorf 96cb73d58b Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 14:44:09 -08:00