Commit Graph

12207 Commits

Author SHA1 Message Date
Brian Behlendorf 709c447ce6 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-16 11:41:18 -07:00
Brian Behlendorf 7bca8f1926 Use vmem_size() only on i386 systems and in the kernel. 2009-03-16 11:27:26 -07:00
Brian Behlendorf af0afd9ce3 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-03-16 11:24:10 -07:00
Brian Behlendorf 53edd221ff Pull unused get_one_dataset() under HAVE_ZPL ifdef. 2009-03-16 11:14:19 -07:00
Brian Behlendorf 75e36e028f Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-03-16 10:43:36 -07:00
Brian Behlendorf a4f629ec9d Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-03-16 10:43:34 -07:00
Brian Behlendorf ec9782ea5a Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-03-16 10:43:22 -07:00
Brian Behlendorf cddaf29902 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-16 10:43:19 -07:00
Brian Behlendorf 4b0d59bd9b Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-03-16 10:43:09 -07:00
Brian Behlendorf 389c6947b4 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-03-16 10:43:07 -07:00
Brian Behlendorf c3a08beab5 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-16 10:42:57 -07:00
Brian Behlendorf ac0ed2b141 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-16 10:42:55 -07:00
Brian Behlendorf 888ef2d4f3 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-03-16 10:42:45 -07:00
Brian Behlendorf 754431f4db Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-16 10:42:43 -07:00
Brian Behlendorf 9062f8b29f Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-03-16 10:42:32 -07:00
Brian Behlendorf 10e245f03f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
Conflicts:
	cmd/zpool/zpool_main.c
2009-03-16 10:42:20 -07:00
Brian Behlendorf d4ae135756 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-03-16 10:41:32 -07:00
Brian Behlendorf 2a3789db00 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-03-16 10:41:29 -07:00
Brian Behlendorf bca66b2540 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-03-16 10:41:19 -07:00
Brian Behlendorf 7b9c5225a1 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-16 10:41:17 -07:00
Brian Behlendorf 9e5a9d849d Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-03-16 10:41:08 -07:00
Brian Behlendorf cba41b9eb1 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-16 10:41:05 -07:00
Brian Behlendorf f7f7e9a403 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-03-16 10:40:53 -07:00
Brian Behlendorf cc6e0aab4f Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-16 10:40:49 -07:00
Brian Behlendorf d3bfee3b4c Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-03-16 10:40:38 -07:00
Brian Behlendorf 9d19cb6390 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-16 10:40:36 -07:00
Brian Behlendorf 5fd1d340b2 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-03-16 10:40:26 -07:00
Brian Behlendorf 7883ef8c6d Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-16 10:40:24 -07:00
Brian Behlendorf ffd5c5a942 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-16 10:40:23 -07:00
Brian Behlendorf 3df5dfc591 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-03-16 10:40:00 -07:00
Brian Behlendorf 33069b5cbb Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-16 10:39:57 -07:00
Brian Behlendorf 6bd672012f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-16 10:39:56 -07:00
Brian Behlendorf a0d6ed81b3 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-03-16 10:39:36 -07:00
Brian Behlendorf be2ea85374 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-03-16 10:39:34 -07:00
Brian Behlendorf 5b846663a0 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-03-16 10:39:23 -07:00
Brian Behlendorf 762ea3d453 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-03-16 10:39:21 -07:00
Brian Behlendorf d149344ae3 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-03-16 10:39:10 -07:00
Brian Behlendorf e98228ab73 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-16 10:39:08 -07:00
Brian Behlendorf abdc073758 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-03-16 10:38:56 -07:00
Brian Behlendorf dbbb5c2e4e Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-16 10:38:52 -07:00
Brian Behlendorf 770ccb405e Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-03-16 10:38:41 -07:00
Brian Behlendorf 5e3d2aae8f Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-16 10:38:39 -07:00
Brian Behlendorf 8734112577 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-03-16 10:38:29 -07:00
Brian Behlendorf a69e953a2d Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-03-16 10:38:20 -07:00
Brian Behlendorf c9cff73d9e Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:
	cmd/zpool/zpool_main.c
2009-03-16 10:32:12 -07:00
Brian Behlendorf 798226a839 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-16 10:30:33 -07:00
Brian Behlendorf be112b3f57 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-16 10:30:31 -07:00
Brian Behlendorf 5ee8a85ba6 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-03-16 10:30:27 -07:00
Brian Behlendorf ab8dbc4a7d Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-03-16 10:12:02 -07:00
Brian Behlendorf 9818e69640 Merge branch 'fix-deadcode' into refs/top-bases/fix-branch 2009-03-16 10:12:01 -07:00