Brian Behlendorf
|
1996f04880
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-20 15:46:31 -08:00 |
|
Brian Behlendorf
|
26d0de9a92
|
Update Makefiles for recent script updates
|
2009-01-20 15:43:21 -08:00 |
|
Brian Behlendorf
|
9e40470aa0
|
Resolve conflict
|
2009-01-14 15:42:28 -08:00 |
|
Brian Behlendorf
|
9c22d76019
|
Minor 'make check' updates
|
2009-01-14 15:38:56 -08:00 |
|
Brian Behlendorf
|
cca384cc3d
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-06 12:36:29 -08:00 |
|
Brian Behlendorf
|
65923b99f9
|
Update to use DS_MODE_USER not removed DS_MODE_STANDARD
|
2009-01-06 12:32:44 -08:00 |
|
Brian Behlendorf
|
b9e46825f5
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:50:16 -08:00 |
|
Brian Behlendorf
|
11b7f20ce1
|
Ensure zpios module makefile is built
|
2009-01-06 09:48:33 -08:00 |
|
Brian Behlendorf
|
3ffae097f4
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-05 13:16:38 -08:00 |
|
Brian Behlendorf
|
db25fe1918
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:15:28 -08:00 |
|
Brian Behlendorf
|
861ec17294
|
Update libunicode
|
2009-01-05 13:13:50 -08:00 |
|
Brian Behlendorf
|
fa7980f197
|
Remove zdump
|
2009-01-05 11:22:57 -08:00 |
|
Brian Behlendorf
|
e3b6de2c22
|
Remove zdump
|
2009-01-05 11:20:33 -08:00 |
|
Brian Behlendorf
|
6fd7b17036
|
Remove remaining zdump Makefile references
|
2009-01-05 11:18:06 -08:00 |
|
Brian Behlendorf
|
1ef314d53f
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-23 10:19:45 -08:00 |
|
Brian Behlendorf
|
ff046c4099
|
Resolve conflict
|
2008-12-23 10:19:41 -08:00 |
|
Brian Behlendorf
|
34e0918846
|
Resolve conflict
|
2008-12-23 10:18:54 -08:00 |
|
Brian Behlendorf
|
f53645b55c
|
Resolve conflict
|
2008-12-23 10:16:17 -08:00 |
|
Brian Behlendorf
|
4a8619da5f
|
Add module build targets
|
2008-12-23 10:13:07 -08:00 |
|
Brian Behlendorf
|
93f4e49cff
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-19 16:03:05 -08:00 |
|
Brian Behlendorf
|
5fab0fdef1
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 16:02:57 -08:00 |
|
Brian Behlendorf
|
274565e290
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:00:37 -08:00 |
|
Brian Behlendorf
|
fe8aa77a1b
|
Add AM_PROG_AS to configure
|
2008-12-19 15:47:14 -08:00 |
|
Brian Behlendorf
|
ce1541961c
|
Resolve context
|
2008-12-15 10:47:24 -08:00 |
|
Brian Behlendorf
|
6661907d23
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-15 10:46:30 -08:00 |
|
Brian Behlendorf
|
ae9906f48d
|
Context fix
|
2008-12-15 10:44:33 -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
|
bf7acdd24c
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-15 10:31:40 -08:00 |
|
Brian Behlendorf
|
6bea798e15
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-15 10:31:35 -08:00 |
|
Brian Behlendorf
|
b3b77e63be
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:30:11 -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
|
1c38136eed
|
Resolve conflict
|
2008-12-12 14:08:10 -08:00 |
|
Brian Behlendorf
|
6cae844981
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-12 14:02:28 -08:00 |
|
Brian Behlendorf
|
09f348197e
|
Resolve conflict
|
2008-12-12 14:00:32 -08:00 |
|
Brian Behlendorf
|
01db09fde5
|
Collapse libzcommon in to libzpool
|
2008-12-12 13:57:47 -08:00 |
|
Brian Behlendorf
|
5664869614
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 09:34:35 -08:00 |
|
Brian Behlendorf
|
2e0a5f5461
|
Refresh makefiles and configure.ac
|
2008-12-12 09:30:42 -08:00 |
|
Brian Behlendorf
|
4b674271a9
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-11 16:57:25 -08:00 |
|
Brian Behlendorf
|
7a9fc78c10
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:54:58 -08:00 |
|
Brian Behlendorf
|
f55d6ad125
|
Remove bugus checks for now
|
2008-12-11 16:51:09 -08:00 |
|
Brian Behlendorf
|
2093483b22
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-11 15:37:33 -08:00 |
|
Brian Behlendorf
|
2b86faed0a
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:36:23 -08:00 |
|
Brian Behlendorf
|
652388f3fb
|
Moving all lib/libspl contexts to linux-libspl branch
|
2008-12-11 15:31:48 -08:00 |
|
Brian Behlendorf
|
fc5f5929e7
|
move zpios to the correct dirs
|
2008-12-11 15:17:33 -08:00 |
|
Brian Behlendorf
|
593aa3e10d
|
Move all current Makefiles to correct locations, updates still needed
|
2008-12-11 14:55:55 -08:00 |
|
Brian Behlendorf
|
98ce19f04c
|
Update avl, nvpair, spl to unique build dirs
|
2008-12-11 13:54:57 -08:00 |
|
Brian Behlendorf
|
ff70433ccb
|
Strip umem related makefile, libumem now lives in the official upstream libumem portability library
|
2008-12-10 12:52:17 -08:00 |
|
Brian Behlendorf
|
28c0e431c0
|
Refer to moved Makefile
|
2008-12-09 14:39:45 -08:00 |
|
Brian Behlendorf
|
9baaa468ac
|
Refresh zfs-branch
|
2008-12-05 09:46:11 -08:00 |
|
Brian Behlendorf
|
ef76e2f5ea
|
Removed build system from master branch, will relocate to linux-zfs-branch
|
2008-12-01 15:41:33 -08:00 |