Brian Behlendorf
|
bd03c9c8bd
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-16 13:22:03 -08:00 |
|
Brian Behlendorf
|
1245a196dd
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-16 13:22:02 -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
|
ddf43eeab5
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-16 09:04:24 -08:00 |
|
Brian Behlendorf
|
1410a4a4f9
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-16 09:04:22 -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
|
9fa0444ffa
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-15 16:54:51 -08:00 |
|
Brian Behlendorf
|
55d6737a61
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-15 16:54:49 -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
|
02f9655041
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-15 16:35:53 -08:00 |
|
Brian Behlendorf
|
5e78680e5d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-15 16:35:51 -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
|
34a42233dd
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-15 10:45:49 -08:00 |
|
Brian Behlendorf
|
da024364e9
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-15 10:45:48 -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
|
475f668821
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-15 10:30:53 -08:00 |
|
Brian Behlendorf
|
7fa259fa3b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-15 10:30:52 -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
|
11a076447a
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 16:27:59 -08:00 |
|
Brian Behlendorf
|
3efb1a78a3
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 16:27:57 -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
|
944105c6eb
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 15:07:20 -08:00 |
|
Brian Behlendorf
|
93137cbddc
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 15:07:19 -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
|
068bd257ce
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 14:56:58 -08:00 |
|
Brian Behlendorf
|
c1f5cdc74d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 14:56:58 -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
|
2db63133a3
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 14:44:17 -08:00 |
|
Brian Behlendorf
|
1519a7f767
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 14:44:16 -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 |
|
Brian Behlendorf
|
cf89e6e4b3
|
Refresh Makefile
|
2008-12-12 14:37:13 -08:00 |