Brian Behlendorf
|
a7b063d224
|
Add DEFAULT_INCLUDE to rules, adjust = to += accordingly
|
2008-12-16 08:58:41 -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
|
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
|
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
|
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
|
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
|
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
|
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
|
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 |
|
Brian Behlendorf
|
19ce5ada17
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 14:29:35 -08:00 |
|
Brian Behlendorf
|
bb4f48461e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 14:29:28 -08:00 |
|
Brian Behlendorf
|
50532fe67b
|
Refresh Makefile
|
2008-12-12 14:27:04 -08:00 |
|
Brian Behlendorf
|
2051c5740b
|
Refresh Makefile
|
2008-12-12 14:26:14 -08:00 |
|
Brian Behlendorf
|
3a440f5607
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 14:21:09 -08:00 |
|
Brian Behlendorf
|
2db44f84d7
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 14:21:02 -08:00 |
|
Brian Behlendorf
|
5a27f3f0a5
|
Comment out libzpool builds for now
|
2008-12-12 14:16:50 -08:00 |
|
Brian Behlendorf
|
fda9ee4941
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 14:01:48 -08:00 |
|
Brian Behlendorf
|
326eb12f28
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 14:01:41 -08:00 |
|
Brian Behlendorf
|
01db09fde5
|
Collapse libzcommon in to libzpool
|
2008-12-12 13:57:47 -08:00 |
|
Brian Behlendorf
|
39a0c3f8e2
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 13:47:39 -08:00 |
|
Brian Behlendorf
|
7035554785
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 13:47:32 -08:00 |
|
Brian Behlendorf
|
de9d8a193f
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2008-12-12 13:46:57 -08:00 |
|
Brian Behlendorf
|
9ba40d2bfa
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-12 13:46:57 -08:00 |
|
Brian Behlendorf
|
b37a410117
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2008-12-12 13:46:56 -08:00 |
|
Brian Behlendorf
|
6da8e28ab6
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2008-12-12 13:46:56 -08:00 |
|
Brian Behlendorf
|
6f3a9cb131
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2008-12-12 13:46:56 -08:00 |
|
Brian Behlendorf
|
2ffe84f024
|
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
|
2008-12-12 13:46:55 -08:00 |
|
Brian Behlendorf
|
240084a033
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2008-12-12 13:46:54 -08:00 |
|
Brian Behlendorf
|
a9e9f0cd45
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-12 13:46:53 -08:00 |