Commit Graph

41 Commits

Author SHA1 Message Date
Brian Behlendorf
76052e446c Revert 'linux-have-xdr' topic branch patch.
This is not needed anymore since a proper XDR implementation was added
to the SPL as of version spl-0.4.3.
2009-03-11 14:39:10 -07:00
Brian Behlendorf
292abc5144 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-03-11 12:45:53 -07:00
Brian Behlendorf
9ceea9faf2 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-11 12:45:15 -07:00
Brian Behlendorf
0cad1eaf40 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 12:43:30 -07:00
Brian Behlendorf
ced9992186 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-03-11 12:43:28 -07:00
Brian Behlendorf
fbb2843086 Ensure idx is properly initialized in all instances. 2009-03-11 12:34:24 -07:00
Brian Behlendorf
3cc7a2814d Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-03-11 11:18:23 -07:00
Brian Behlendorf
7a08ef9d52 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
Conflicts:
	module/zfs/spa_boot.c
2009-03-11 11:17:23 -07:00
Brian Behlendorf
dff484a388 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 11:09:13 -07:00
Brian Behlendorf
8fe801fd8f Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2009-03-11 11:00:42 -07:00
Ricardo M. Correia
af45030850 Added 'gcc-ident-pragmas' branch. 2009-03-11 10:59:45 -07:00
Brian Behlendorf
f65339a529 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-03-10 21:27:34 -07:00
Brian Behlendorf
e610bf6e09 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-10 21:26:59 -07:00
Brian Behlendorf
c8e569dd1c Build system and packaging (RPM support) (Part 2)
Complete support for dist install srpm and rpm make targets.
2009-03-10 21:13:30 -07:00
Brian Behlendorf
1aab10f3c8 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-07 15:52:46 -08:00
Brian Behlendorf
53a6418874 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-07 15:52:31 -08:00
Brian Behlendorf
2a76f03369 Update distfiles 2009-01-07 15:49:36 -08:00
Brian Behlendorf
407eef59dd Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-05 15:45:17 -08:00
Brian Behlendorf
b2db87f254 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 15:45:05 -08:00
Brian Behlendorf
760d78b9f8 Move default include paths after custom include paths so local stuff gets picked up first 2009-01-05 15:42:56 -08:00
Brian Behlendorf
7c6d905ec3 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-23 11:50:11 -08:00
Brian Behlendorf
82cd3659a2 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-23 11:49:58 -08:00
Brian Behlendorf
5a0a9cc451 Update makefiles 2008-12-23 11:47:33 -08:00
Brian Behlendorf
526bb71c86 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-11 15:24:53 -08:00
Brian Behlendorf
6cc6f50a02 Move to new home 2008-12-11 15:21:20 -08:00
Brian Behlendorf
d68cecbb9d Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-11 14:59:52 -08:00
Brian Behlendorf
515c1981f2 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 14:59:39 -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
45ea2016b4 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-11 14:26:24 -08:00
Brian Behlendorf
8f8a7e587a Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 14:26:10 -08:00
Brian Behlendorf
503068ecec Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-11 14:25:32 -08:00
Brian Behlendorf
82c8f9af50 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 14:24:49 -08:00
Brian Behlendorf
a4076c7544 Script updates 2008-12-11 14:21:14 -08:00
Brian Behlendorf
c4911ece24 Move library files to lib 2008-12-11 14:16:55 -08:00
Brian Behlendorf
fdff27558a Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-11 14:05:08 -08:00
Brian Behlendorf
94e1055395 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 14:04:54 -08:00
Brian Behlendorf
98ce19f04c Update avl, nvpair, spl to unique build dirs 2008-12-11 13:54:57 -08:00
Brian Behlendorf
7515df142f Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-11 11:36:31 -08:00
Brian Behlendorf
5bb8f9ec25 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 11:36:00 -08:00
Brian Behlendorf
4f5d567cfd Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 11:24:45 -08:00
Brian Behlendorf
172bb4bd5e Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00