Commit Graph

871 Commits

Author SHA1 Message Date
Brian Behlendorf 98e19f56b5 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-11 15:37:02 -08:00
Brian Behlendorf e24a59a697 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 15:36:51 -08:00
Brian Behlendorf f3dc282dd1 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-11 15:36:45 -08:00
Brian Behlendorf ee17768d94 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-11 15:36:38 -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 cf06f2f58f Whoops put these back 2008-12-11 15:34:32 -08:00
Brian Behlendorf 652388f3fb Moving all lib/libspl contexts to linux-libspl branch 2008-12-11 15:31:48 -08:00
Brian Behlendorf 9245824527 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-11 15:08:23 -08:00
Brian Behlendorf d46b60f374 Move libspl to new location 2008-12-11 15:06:34 -08:00
Brian Behlendorf be5e4ee04f Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-11 15:00:50 -08:00
Brian Behlendorf 477a85d905 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-11 15:00:01 -08:00
Brian Behlendorf 6d37a4ad97 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-11 14:59:57 -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 f46d4ce0a4 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-11 14:59:32 -08:00
Brian Behlendorf f27584417a Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-11 14:59:24 -08:00
Brian Behlendorf a3c66a6b89 Resolve conflict 2008-12-11 14:58:34 -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 a4a44a76d4 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-11 14:27:09 -08:00
Brian Behlendorf 2bcfa6809c Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-11 14:26:34 -08:00
Brian Behlendorf 4ebd4f1f00 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-11 14:26:29 -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 c5c9d459a5 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-11 14:26:03 -08:00
Brian Behlendorf b2e6f14250 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-11 14:25:53 -08:00
Brian Behlendorf 3bd537afcc Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-11 14:25:35 -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 6bc8988bec Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads 2008-12-11 14:25:21 -08:00
Brian Behlendorf 1e849d9b3b Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2008-12-11 14:25:08 -08:00
Brian Behlendorf b8294b1311 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 14:25:05 -08:00
Brian Behlendorf 022db7f816 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-11 14:25:01 -08:00
Brian Behlendorf ec2b4ef2ed Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2008-12-11 14:24:59 -08:00
Brian Behlendorf 9af6637db5 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-11 14:24:57 -08:00
Brian Behlendorf c325ac879c Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2008-12-11 14:24:56 -08:00
Brian Behlendorf 3e2988aa8b Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2008-12-11 14:24:50 -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 9b3c631dbd Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-11 14:24:48 -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 a400443ecf Resolve conflict 2008-12-11 14:07:08 -08:00
Brian Behlendorf 31927647a8 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-11 14:05:18 -08:00
Brian Behlendorf b9c746ed0b Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-11 14:05:13 -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 4d8fd75005 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-11 14:04:46 -08:00
Brian Behlendorf 3ab9fee91c Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-11 14:04:35 -08:00
Brian Behlendorf 44ffa43709 Resolve conflict 2008-12-11 14:01:47 -08:00
Brian Behlendorf 98ce19f04c Update avl, nvpair, spl to unique build dirs 2008-12-11 13:54:57 -08:00
Brian Behlendorf 8b20091dda Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-11 11:47:54 -08:00
Brian Behlendorf 11e1ce8c2e Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-11 11:36:50 -08:00
Brian Behlendorf 076f7c6a5f Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-11 11:36:40 -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 4003bc5b2c Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-11 11:35:48 -08:00
Brian Behlendorf 1b0348e335 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-11 11:35:29 -08:00
Brian Behlendorf aca9d98817 Fix conflict 2008-12-11 11:34:16 -08:00
Brian Behlendorf f07f82e93a Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads 2008-12-11 11:26:43 -08:00
Brian Behlendorf 84e65c5c1e Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2008-12-11 11:25:50 -08:00
Brian Behlendorf 756a122d37 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 11:25:42 -08:00
Brian Behlendorf d6ccbb14c5 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-11 11:25:28 -08:00
Brian Behlendorf ff282a978f Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2008-12-11 11:25:22 -08:00
Brian Behlendorf cdd670cb2f Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-11 11:25:15 -08:00
Brian Behlendorf 8f8ac4288f Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2008-12-11 11:25:09 -08:00
Brian Behlendorf b342e90e44 Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2008-12-11 11:24:51 -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 3420896332 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-11 11:24:42 -08:00
Brian Behlendorf b453b61272 Fix libspl move to the wrong place 2008-12-11 11:22:02 -08:00
Brian Behlendorf 77755a5771 Add a few missing files 2008-12-11 11:14:49 -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
Brian Behlendorf b6097ae55a Remove stray stub kernel files which should be brought in my linux-kernel-module patch 2008-12-02 08:47:21 -08:00
Brian Behlendorf 34dc7c2f25 Initial Linux ZFS GIT Repo 2008-11-20 12:01:55 -08:00