Commit Graph

1759 Commits

Author SHA1 Message Date
Brian Behlendorf 786894010a Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-03-11 14:58:37 -07:00
Brian Behlendorf 2ba55e86c5 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-11 14:58:34 -07:00
Ricardo M. Correia db42bfe00a Fixed compilation error due to missing xdr_control() implementation in Linux. 2009-03-11 14:53:41 -07:00
Brian Behlendorf 03c7c8e4a9 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-03-11 14:45:01 -07:00
Brian Behlendorf f39adcbb54 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-03-11 14:44:59 -07:00
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 8cb718a76c Refresh autogen products 2009-03-11 14:25:09 -07:00
Brian Behlendorf 3f8174047a Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-03-11 14:13:57 -07:00
Brian Behlendorf b2041bc8ef Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-11 14:13:33 -07:00
Brian Behlendorf 962c862580 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-11 14:13:07 -07:00
Brian Behlendorf 330dbde81a Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-11 14:12:39 -07:00
Brian Behlendorf e0d1c4926b Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-11 14:12:13 -07:00
Brian Behlendorf 34f01d7e28 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-11 14:12:00 -07:00
Brian Behlendorf 1d544f4131 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-11 14:11:31 -07:00
Brian Behlendorf 94dfc4263d Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-03-11 14:11:18 -07:00
Brian Behlendorf ab760deda7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-11 14:10:39 -07:00
Brian Behlendorf cac68bc478 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-11 14:09:49 -07:00
Brian Behlendorf 5afc3db3ce Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-11 14:08:57 -07:00
Brian Behlendorf 1ca6578ebc Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 14:08:51 -07:00
Brian Behlendorf 8a3b1a5ff5 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 14:08:50 -07:00
Brian Behlendorf e5011401cd Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2009-03-11 14:08:48 -07:00
Brian Behlendorf 3226eea157 Resolve additional cases where gcc wants extra parenthesis.
These were introduced by the rebase to b108.
2009-03-11 13:57:47 -07:00
Brian Behlendorf b8dd7de0b5 Refresh autogen products 2009-03-11 13:30:38 -07:00
Brian Behlendorf 75cd2f2a81 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-03-11 12:22:35 -07:00
Brian Behlendorf d57bb8312d Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-11 12:22:30 -07:00
Brian Behlendorf 84b63f7730 Remove all #pragma idents from libspl. 2009-03-11 12:13:44 -07:00
Brian Behlendorf 8927c974cf Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-03-11 11:22:46 -07:00
Brian Behlendorf af12291488 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
Conflicts:
	module/zfs/rrwlock.c
	module/zfs/zfs_replay.c
2009-03-11 11:22:11 -07:00
Brian Behlendorf 3a23753b70 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-11 11:20:30 -07:00
Brian Behlendorf 261ca2beb9 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-11 11:19:58 -07:00
Brian Behlendorf f6c5e39707 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-11 11:19:26 -07:00
Brian Behlendorf 1c8bbc5fd9 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-11 11:19:10 -07:00
Brian Behlendorf 0eca278f8a Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-11 11:18:37 -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 47e0037a8b Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-11 11:15:59 -07:00
Brian Behlendorf bf200630f9 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:
	module/zfs/rrwlock.c
	module/zfs/spa_boot.c
	module/zfs/zfs_replay.c
2009-03-11 11:12:24 -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 5f30a3cb0e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 11:09:11 -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 6980b84ea9 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-03-11 10:55:09 -07:00
Brian Behlendorf 0c8622c47c Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-11 10:55:05 -07:00
Ricardo M. Correia 4a118b6227 Minor bug fix due to MAXOFFSET_T constant being too large on 32-bit systems. 2009-03-11 10:47:20 -07:00
Brian Behlendorf d5fd9f25a3 Refresh autogen products 2009-03-10 22:09:49 -07:00
Brian Behlendorf b775e4c206 Refresh autogen products 2009-03-10 22:04:11 -07:00
Brian Behlendorf d9480e2bd0 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-03-10 22:03:06 -07:00
Brian Behlendorf 2d37cf7361 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-10 22:03:01 -07:00
Brian Behlendorf c05c1aa6f9 Build system and packaging (RPM support) (Part 4)
Complete support for dist install srpm and rpm make targets.
2009-03-10 21:57:56 -07:00
Brian Behlendorf 401cd9e1d4 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-03-10 21:31:09 -07:00
Brian Behlendorf 66a5ec0f7b Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-10 21:30:48 -07:00
Brian Behlendorf 7ca5d85ab6 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-10 21:30:24 -07:00
Brian Behlendorf 171086af52 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-10 21:28:53 -07:00
Brian Behlendorf 8cd1a22759 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-10 21:28:27 -07:00
Brian Behlendorf 88f71167ae Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-10 21:28:14 -07:00
Brian Behlendorf 370b674e09 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-10 21:27:49 -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 64c77b5cdb Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-10 21:26:14 -07:00
Brian Behlendorf 36860ec1a8 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:

	module/Makefile.in
2009-03-10 21:23:17 -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 e1b736ecc8 Refresh autogen products 2009-03-10 11:42:01 -07:00
Brian Behlendorf fc98c23a11 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-02-18 16:06:54 -08:00
Brian Behlendorf da2df72c28 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-02-18 16:06:49 -08:00
Brian Behlendorf 2cd31b723e Add HW_HOSTID_LEN for libspl use 2009-02-18 16:00:50 -08:00
Brian Behlendorf 5511b1d96d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-02-18 15:24:04 -08:00
Brian Behlendorf bc2357f461 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-02-18 15:23:45 -08:00
Brian Behlendorf 5164741b40 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-02-18 15:23:29 -08:00
Brian Behlendorf a6fbd61ff1 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-02-18 15:23:07 -08:00
Brian Behlendorf fef6d9a19c Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-02-18 15:22:45 -08:00
Brian Behlendorf 64cf713c65 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-02-18 15:22:38 -08:00
Brian Behlendorf e47dcbd2d7 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-02-18 15:22:12 -08:00
Brian Behlendorf 03f8c8f94b Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-02-18 15:22:04 -08:00
Brian Behlendorf b878be0ee1 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-02-18 15:21:35 -08:00
Brian Behlendorf e77f9a10a9 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-02-18 15:20:53 -08:00
Brian Behlendorf e60db6f9dd Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-02-18 15:20:14 -08:00
Brian Behlendorf 830ac5b109 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-02-18 15:20:11 -08:00
Brian Behlendorf 6f8f3b5532 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-02-18 15:20:10 -08:00
Brian Behlendorf 9d4d22a26e Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-02-18 15:20:08 -08:00
Brian Behlendorf 8c228734a3 Fix cast 2009-02-18 15:15:56 -08:00
Brian Behlendorf b4028a1bf5 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-02-18 14:38:55 -08:00
Brian Behlendorf 7b8eca908f Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
Conflicts:

	cmd/zpool/zpool_main.c
2009-02-18 14:38:20 -08:00
Brian Behlendorf 181fd4addc Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-02-18 14:37:16 -08:00
Brian Behlendorf 437bc77985 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-02-18 14:36:49 -08:00
Brian Behlendorf be3ffc5f9e Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-02-18 14:36:16 -08:00
Brian Behlendorf ba8fc98d00 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-02-18 14:36:04 -08:00
Brian Behlendorf d9229ad643 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-02-18 14:35:32 -08:00
Brian Behlendorf a278e153c4 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-02-18 14:35:20 -08:00
Brian Behlendorf 9f4865e4ca Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-02-18 14:34:45 -08:00
Brian Behlendorf f78c15d84f Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-02-18 14:34:03 -08:00
Brian Behlendorf 8090a9a908 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:

	cmd/zpool/zpool_main.c
2009-02-18 14:31:46 -08:00
Brian Behlendorf 7872d84be6 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-02-18 14:30:54 -08:00
Brian Behlendorf 15f5ddebdf Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
Conflicts:

	lib/libzpool/kernel.c
2009-02-18 14:29:08 -08:00
Brian Behlendorf 109a1d5b16 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2009-02-18 14:28:38 -08:00
Brian Behlendorf 6fe19bd252 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
Conflicts:

	lib/libzpool/kernel.c
	module/zfs/arc.c
2009-02-18 14:28:15 -08:00
Brian Behlendorf f0a8aedfbc Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
Conflicts:

	lib/libzpool/kernel.c
	module/zfs/arc.c
2009-02-18 14:27:12 -08:00
Brian Behlendorf 3eb7fa9afd Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow 2009-02-18 14:04:08 -08:00
Brian Behlendorf 5be9e325a1 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
Conflicts:

	module/zfs/arc.c
2009-02-18 14:03:22 -08:00
Brian Behlendorf ba528721da Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2009-02-18 13:12:58 -08:00
Brian Behlendorf 0b8e48b813 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2009-02-18 13:12:53 -08:00
Brian Behlendorf e203e7b48f Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2009-02-18 13:12:35 -08:00
Brian Behlendorf f686a87058 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Conflicts:

	module/zfs/arc.c
2009-02-18 13:12:26 -08:00
Brian Behlendorf 3b17164f71 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Conflicts:

	module/zfs/vdev.c
	module/zfs/zio.c
2009-02-18 13:09:32 -08:00
Brian Behlendorf d164b20935 Rebase master to b108 2009-02-18 12:51:31 -08:00
Brian Behlendorf 8278b2e2a8 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-02-03 09:46:50 -08:00
Brian Behlendorf 27e7565a93 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-02-03 09:46:46 -08:00
Brian Behlendorf 3d86fad730 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-02-03 09:46:36 -08:00
Brian Behlendorf 9cd029b543 Remove mknod from library.
This is all nowhandled in the SPL.  When HAVE_GPL_ONLY_SYMBOLS is defined
because the module license is set to GPL we can leverage the udev interfaces
which will create the device.  When HAVE_GPL_ONLY_SYMBOLS is not defined
we resort to an ugly hack and the SPL invokes a usermode helper to create
to missing device file for us in /dev/.  Using GPL version modules is off
course preperable when possible.
2009-02-03 09:38:53 -08:00
Brian Behlendorf 1d4ad2d62e Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-16 14:56:15 -08:00
Brian Behlendorf ca804c66f8 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-16 14:55:26 -08:00
Brian Behlendorf 7c5b7d2a94 This should always be success when zvol support is disabled 2009-01-16 14:52:35 -08:00
Brian Behlendorf f863f8f848 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-15 14:22:27 -08:00
Brian Behlendorf adcb983918 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-15 14:22:14 -08:00
Brian Behlendorf 389b037e7a Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-15 14:22:01 -08:00
Brian Behlendorf df7ad715a9 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-15 14:21:49 -08:00
Brian Behlendorf d58ed0e6c7 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-15 14:21:36 -08:00
Brian Behlendorf 594ce22168 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-15 14:21:30 -08:00
Brian Behlendorf 476261f2d5 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-15 14:21:18 -08:00
Brian Behlendorf 2c83372734 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-15 14:21:11 -08:00
Brian Behlendorf 091a4a4ca4 Resolve conflict with removed cleaner type 2009-01-15 14:20:49 -08:00
Brian Behlendorf cb8e50168e Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-15 14:19:06 -08:00
Brian Behlendorf 1f372d9030 Resolve conflict with removed cleaner type 2009-01-15 14:18:01 -08:00
Brian Behlendorf ddaad20220 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 14:16:23 -08:00
Brian Behlendorf a42707fcc0 Resolve conflict with removed cleaner type 2009-01-15 14:16:03 -08:00
Brian Behlendorf 48a55a0a10 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2009-01-15 14:13:54 -08:00
Brian Behlendorf 551838a6c8 Resolve conflict with removed cleaner type 2009-01-15 14:13:39 -08:00
Brian Behlendorf da7151a89e Resolve conflict with removed cleaner type 2009-01-15 14:11:19 -08:00
Brian Behlendorf 7b54fe44dc Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow 2009-01-15 14:05:38 -08:00
Brian Behlendorf 977fef2ba7 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2009-01-15 14:05:32 -08:00
Brian Behlendorf 2f36bf5af4 Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2009-01-15 14:05:29 -08:00
Brian Behlendorf 35a269c06c Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2009-01-15 14:05:26 -08:00
Brian Behlendorf a2e601c6e3 Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2009-01-15 14:04:39 -08:00
Brian Behlendorf 3fa768e21b Resolve conflict with removed cleaner type 2009-01-15 14:04:35 -08:00
Brian Behlendorf d3df6b2012 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2009-01-15 14:01:51 -08:00
Brian Behlendorf fb5f0bc833 Rebase master to b105 2009-01-15 13:59:39 -08:00
Brian Behlendorf 922f424be6 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-14 14:27:46 -08:00
Brian Behlendorf aff2252263 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-14 14:27:42 -08:00
Brian Behlendorf fd93449de9 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-14 14:27:31 -08:00
Brian Behlendorf 4fdb04d0a1 A little hackery to handle using zdb when the module stack isn't loaded. This is a hack and should be addressed upstream, zdb should not be attempting to initialize services it doesn't need 2009-01-14 14:25:25 -08:00
Brian Behlendorf e972830059 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-14 12:06:46 -08:00
Brian Behlendorf e6746c2609 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-01-14 12:06:41 -08:00
Brian Behlendorf 3764ec0e1e Fixed sizeof() issue and minor cleanup 2009-01-14 12:03:03 -08:00
Brian Behlendorf 8778a30cda Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-14 10:42:47 -08:00
Brian Behlendorf 97073208f8 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-14 10:42:45 -08:00
Brian Behlendorf bdde0d9d40 Return success here not failure 2009-01-14 10:37:35 -08:00
Brian Behlendorf 9716031521 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-13 09:55:44 -08:00
Brian Behlendorf 7f9ce14e58 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-13 09:55:40 -08:00
Brian Behlendorf 09b6f64e2d Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-13 09:55:30 -08:00
Brian Behlendorf ef6d827a88 Don't check HAVE_SPL unavailable in userspace build 2009-01-13 09:53:35 -08:00
Brian Behlendorf d68ed9fc41 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-09 16:54:22 -08:00
Brian Behlendorf a62a385848 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-09 16:54:15 -08:00
Brian Behlendorf 13ab1d30be Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-09 16:53:53 -08:00
Brian Behlendorf e22bfeab4e Update load/unload message, mknod /dev/zfs when udev is unavailable 2009-01-09 16:50:08 -08:00
Brian Behlendorf 5801f33f50 Refresh autogen products 2009-01-09 15:12:36 -08:00
Brian Behlendorf e05d7c1e7e Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-09 15:12:00 -08:00
Brian Behlendorf 402405558a Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-09 15:11:56 -08:00
Brian Behlendorf b8fc1110d1 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-09 15:11:48 -08:00
Brian Behlendorf fce16fe818 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-09 15:11:38 -08:00
Brian Behlendorf d2d018fafa Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-09 15:11:29 -08:00
Brian Behlendorf 1fd9167bc0 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-09 15:11:25 -08:00
Brian Behlendorf e86fa83ee6 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-09 15:11:16 -08:00
Brian Behlendorf 89cf8c8a67 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-09 15:11:11 -08:00
Brian Behlendorf aa6c4ff685 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-09 15:10:59 -08:00
Brian Behlendorf 921ebaf7f7 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-09 15:10:43 -08:00
Brian Behlendorf 522fb18428 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-09 15:10:26 -08:00
Brian Behlendorf 6791a1ee34 I don't think we need this in userspace 2009-01-09 15:07:32 -08:00
Brian Behlendorf 347805ecd8 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-09 14:46:45 -08:00
Brian Behlendorf a7e5f34acb Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-09 14:46:41 -08:00
Brian Behlendorf 7af644b8b3 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-09 14:46:32 -08:00
Brian Behlendorf ca0b39e0e7 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-09 14:46:23 -08:00
Brian Behlendorf fd07f08222 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-09 14:46:14 -08:00
Brian Behlendorf 0f48a52f65 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-09 14:46:10 -08:00
Brian Behlendorf d584ad239d Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-09 14:46:01 -08:00
Brian Behlendorf 4022f85bac Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-09 14:45:56 -08:00
Brian Behlendorf be3a17e437 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-09 14:45:45 -08:00
Brian Behlendorf 8e1f5d7bec Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-09 14:45:29 -08:00
Brian Behlendorf d315fcf28e Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-09 14:45:13 -08:00
Brian Behlendorf ff09d64647 Pull all source in to be built, it will be ifdef'ed out as need by higher level topic branches 2009-01-09 14:37:45 -08:00
Brian Behlendorf 9855548496 Refresh autogen products 2009-01-09 11:35:52 -08:00
Brian Behlendorf 2cc958820e Refresh autogen products 2009-01-08 10:42:46 -08:00
Brian Behlendorf 62ce1a5d0e Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-08 10:29:29 -08:00
Brian Behlendorf 8a6f0ab272 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-08 10:29:23 -08:00
Brian Behlendorf eba9726539 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-08 10:29:13 -08:00
Brian Behlendorf b7256edf16 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-08 10:29:02 -08:00
Brian Behlendorf dd069ed4fe Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-08 10:28:52 -08:00
Brian Behlendorf 9d335bca85 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-08 10:28:47 -08:00
Brian Behlendorf e1a4af24af Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-08 10:28:37 -08:00
Brian Behlendorf a43e0b50fb Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-08 10:28:32 -08:00
Brian Behlendorf 06749d1581 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-08 10:28:18 -08:00
Brian Behlendorf c281c15c84 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-08 10:28:00 -08:00
Brian Behlendorf b7d9adb500 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-08 10:27:42 -08:00
Brian Behlendorf b457fb49f9 Remove vdev_disk from userspace build, vdev_file is used 2009-01-08 10:23:59 -08:00
Brian Behlendorf 4996278dd4 Refresh autogen products 2009-01-05 13:48:29 -08:00
Brian Behlendorf 46d1c1ff3d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-05 13:47:32 -08:00
Brian Behlendorf 77c4ef21ab Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-05 13:47:29 -08:00
Brian Behlendorf 889bb92210 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-05 13:47:21 -08:00
Brian Behlendorf eea4cc8e0e Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-05 13:47:12 -08:00
Brian Behlendorf 73e48eae6d Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-05 13:47:03 -08:00
Brian Behlendorf 97dab5053e Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-05 13:46:59 -08:00
Brian Behlendorf dbcb8f3921 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-05 13:46:51 -08:00
Brian Behlendorf a9bfb78b5a Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-05 13:46:47 -08:00
Brian Behlendorf 3bc01c0326 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 13:46:35 -08:00
Brian Behlendorf f88ab3c355 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-05 13:46:21 -08:00
Brian Behlendorf 80ed6c342d Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-05 13:46:06 -08:00
Brian Behlendorf c15fa0ceb0 Add include paths 2009-01-05 13:44:26 -08:00
Brian Behlendorf 9eebf90277 Refresh autogen products 2009-01-05 13:40:25 -08:00
Brian Behlendorf 1f02aaba1c Refresh autogen products 2009-01-05 12:47:00 -08:00
Brian Behlendorf aaefbb4e76 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-05 12:45:45 -08:00
Brian Behlendorf 35cfc1bb85 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-05 12:45:38 -08:00
Brian Behlendorf 0f742dfc96 Refresh context 2009-01-05 12:45:17 -08:00
Brian Behlendorf 681ba5c296 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-05 12:41:42 -08:00
Brian Behlendorf 727a4622dc Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-05 12:41:24 -08:00
Brian Behlendorf 9c73332e81 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-05 12:41:15 -08:00
Brian Behlendorf d5350109f4 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-05 12:40:55 -08:00
Brian Behlendorf 6ce317a8d5 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-05 12:40:48 -08:00
Brian Behlendorf 9c2bf69ecb Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 12:40:25 -08:00
Brian Behlendorf c8fa7c9b23 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-05 12:39:56 -08:00
Brian Behlendorf 9a0cb95b1b Resolve conflict 2009-01-05 12:38:23 -08:00
Brian Behlendorf ce7115b807 Add unicode makefile references and support 2009-01-05 12:33:09 -08:00
Brian Behlendorf ced77c2f1b Add unicode makefile references and support 2009-01-05 12:32:55 -08:00
Brian Behlendorf cbee2aba7e Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-05 11:54:54 -08:00
Brian Behlendorf 1b327abcfd Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-01-05 11:54:52 -08:00
Brian Behlendorf 3d2e086e21 Remove u8 support, moved to libu8 2009-01-05 11:52:51 -08:00
Brian Behlendorf 9403f4a605 Refresh autogen products 2008-12-23 12:39:25 -08:00
Brian Behlendorf d8c0d57440 Refresh autogen products 2008-12-23 10:41:37 -08:00
Brian Behlendorf 50735743b7 Err undo that 2008-12-22 16:22:28 -08:00
Brian Behlendorf bb128e51e6 Use thread so we can add other goodies beyond simply the pthread base 2008-12-22 16:20:36 -08:00
Brian Behlendorf fccc852847 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 15:21:13 -08:00
Brian Behlendorf 53f2b61ce1 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-22 15:21:10 -08:00
Brian Behlendorf 89585b82fa Add missing limits 2008-12-22 15:17:57 -08:00
Brian Behlendorf 29baca7561 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 15:06:45 -08:00
Brian Behlendorf 3251158230 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-22 15:06:42 -08:00
Brian Behlendorf 091c16c185 Add missing tzfile.h 2008-12-22 15:04:47 -08:00
Brian Behlendorf 9481daedcd Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 14:59:09 -08:00
Brian Behlendorf 314e57ba29 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-22 14:59:06 -08:00
Brian Behlendorf b0704f1597 Add missing header for ztest 2008-12-22 14:57:15 -08:00
Brian Behlendorf d46a4ba0dc Refresh autogen products 2008-12-22 14:55:05 -08:00
Brian Behlendorf f23a920ddd Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 14:45:48 -08:00
Brian Behlendorf 97e7199aaf Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2008-12-22 14:45:43 -08:00
Brian Behlendorf ef6c136edb Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 14:45:33 -08:00
Brian Behlendorf fccd2786e1 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-22 14:45:23 -08:00
Brian Behlendorf a9545c30e8 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-22 14:45:14 -08:00
Brian Behlendorf 86efe1f206 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-22 14:45:09 -08:00
Brian Behlendorf 12573fb5b9 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-22 14:44:59 -08:00
Brian Behlendorf c267d86b09 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-22 14:44:55 -08:00
Brian Behlendorf 16d3bec487 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 14:44:42 -08:00
Brian Behlendorf 997a274a13 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-22 14:44:25 -08:00
Brian Behlendorf ff8a2f61ff Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 14:44:07 -08:00
Brian Behlendorf 29b47d366e Remove some headers 2008-12-22 14:42:02 -08:00
Brian Behlendorf 75b5893ca5 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 13:53:09 -08:00
Brian Behlendorf 139792e6b2 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2008-12-22 13:53:03 -08:00
Brian Behlendorf fa078fa9dd Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 13:52:53 -08:00
Brian Behlendorf 7edc6e24a8 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-22 13:52:42 -08:00
Brian Behlendorf 9bf58af1f5 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-22 13:52:31 -08:00
Brian Behlendorf 6157e981b3 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-22 13:52:26 -08:00
Brian Behlendorf 262e367cd5 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-22 13:52:16 -08:00
Brian Behlendorf 877699acb1 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-22 13:52:11 -08:00
Brian Behlendorf 1f72057409 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 13:51:57 -08:00
Brian Behlendorf 52bfcda357 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-22 13:51:39 -08:00
Brian Behlendorf 05fafc638f Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 13:51:21 -08:00
Brian Behlendorf 90e5216ea9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 13:51:17 -08:00
Brian Behlendorf 035e4d373e Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-22 13:51:16 -08:00
Brian Behlendorf c9597f9a4f Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-22 13:51:15 -08:00
Brian Behlendorf 6bed331e59 More compat changes 2008-12-22 13:47:58 -08:00
Brian Behlendorf d1178104fb Refresh autogen products 2008-12-22 12:55:48 -08:00
Brian Behlendorf d259de062c Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 12:55:11 -08:00
Brian Behlendorf 0789abcd67 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2008-12-22 12:55:06 -08:00
Brian Behlendorf 57e03b4986 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 12:54:57 -08:00
Brian Behlendorf bc90a3635d Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-22 12:54:46 -08:00
Brian Behlendorf 56f6031652 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-22 12:54:37 -08:00
Brian Behlendorf bdfff917f3 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-22 12:54:32 -08:00
Brian Behlendorf a40064cfd1 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-22 12:54:21 -08:00
Brian Behlendorf b7770e3b13 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-22 12:54:16 -08:00
Brian Behlendorf 34f30113a8 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 12:54:03 -08:00
Brian Behlendorf 195c61d105 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-22 12:53:46 -08:00
Brian Behlendorf b93191445c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 12:53:27 -08:00
Brian Behlendorf 121effcbee Pull everything in to the Makefile 2008-12-22 12:51:03 -08:00
Brian Behlendorf 02d41bf31e Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 12:27:04 -08:00
Brian Behlendorf 1e9c6b3020 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2008-12-22 12:24:47 -08:00
Brian Behlendorf 79491b69f4 Start linux-have-zpl layer 2008-12-22 12:23:27 -08:00
Brian Behlendorf 08a400676b Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 12:09:15 -08:00
Brian Behlendorf a6d6f31db6 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-22 12:09:08 -08:00
Brian Behlendorf d7d260b870 Removing branch to readd under new name 2008-12-22 12:05:11 -08:00
Brian Behlendorf 4f1e40767b Refresh autogen products 2008-12-22 11:46:00 -08:00
Brian Behlendorf 31ff40b9ec Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 11:42:32 -08:00
Brian Behlendorf d7fafdb56e Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 11:42:23 -08:00
Brian Behlendorf 300ff503d4 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-22 11:42:13 -08:00
Brian Behlendorf d0cacda56c Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-22 11:42:04 -08:00
Brian Behlendorf f752d29d6c Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-22 11:41:59 -08:00
Brian Behlendorf 7b4bf789e9 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 11:41:50 -08:00
Brian Behlendorf 6d13a998fb Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-22 11:41:45 -08:00
Brian Behlendorf 86392b70ad Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-22 11:41:40 -08:00
Brian Behlendorf 187be3051e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 11:41:27 -08:00
Brian Behlendorf 7f2da73568 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-22 11:41:11 -08:00
Brian Behlendorf aece7f6822 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 11:40:54 -08:00
Brian Behlendorf 7047bb0678 Add missing files from Makefile.am 2008-12-22 11:36:48 -08:00
Brian Behlendorf 0e72235081 Refresh autogen products 2008-12-22 10:40:25 -08:00
Brian Behlendorf ebdd4dacfa Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 10:37:51 -08:00
Brian Behlendorf 01dee27561 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-22 10:37:44 -08:00
Brian Behlendorf 4e564d755b Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 10:37:42 -08:00
Brian Behlendorf 7e800d8125 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-22 10:37:33 -08:00
Brian Behlendorf 7e1406dd6c Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-22 10:37:24 -08:00
Brian Behlendorf edaabab594 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-22 10:37:19 -08:00
Brian Behlendorf 8ad9104988 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 10:37:10 -08:00
Brian Behlendorf 5169758856 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-22 10:37:05 -08:00
Brian Behlendorf c6e93310af Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-22 10:37:00 -08:00
Brian Behlendorf bdbd91fe46 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 10:36:48 -08:00
Brian Behlendorf 11147f632c Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-22 10:36:32 -08:00
Brian Behlendorf 9c47372b96 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 10:36:15 -08:00
Brian Behlendorf 5f0a629790 Add enable_extended_FILE_stdio #define 2008-12-22 10:34:22 -08:00
Brian Behlendorf 10911f9d71 Add missing sources 2008-12-22 10:27:41 -08:00
Brian Behlendorf 64359e919d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 10:15:22 -08:00
Brian Behlendorf 42344f04c1 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-22 10:15:20 -08:00
Brian Behlendorf 8fdc6ee079 Stub out two more funcs until zpl support exists 2008-12-22 10:13:31 -08:00
Brian Behlendorf 6b0aac60eb Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 10:03:24 -08:00
Brian Behlendorf 0ecac4865c Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-22 10:03:22 -08:00
Brian Behlendorf e8b703cb46 Add sys/time.h 2008-12-22 10:00:01 -08:00
Brian Behlendorf 3b465d5229 Refresh autogen products 2008-12-19 17:05:29 -08:00
Brian Behlendorf fd8e8eb804 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 16:57:58 -08:00
Brian Behlendorf 783faf9040 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 16:57:45 -08:00
Brian Behlendorf 6d9b733aab Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-19 16:57:43 -08:00
Brian Behlendorf c2177925af Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-19 16:57:23 -08:00
Brian Behlendorf b15673351e Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-19 16:57:06 -08:00
Brian Behlendorf ea8c323c36 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 16:56:56 -08:00
Brian Behlendorf 1a2361c2d7 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 16:56:39 -08:00
Brian Behlendorf 1963e197a7 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 16:56:31 -08:00
Brian Behlendorf e8676f2c5f Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 16:56:24 -08:00
Brian Behlendorf 2e8b703fff Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 16:56:03 -08:00
Brian Behlendorf 96e85b9e96 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-19 16:55:34 -08:00
Brian Behlendorf 4420db3d37 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 16:55:00 -08:00
Brian Behlendorf 60289ccd8f Add zfs_byteswap 2008-12-19 16:51:14 -08:00
Brian Behlendorf ae21fcad1c Add missing acl files 2008-12-19 16:49:31 -08:00
Brian Behlendorf 1127f0dbbb Refresh autogen products 2008-12-19 16:36:58 -08:00
Brian Behlendorf 7ed56c768d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 16:36:18 -08:00
Brian Behlendorf 252ef2053c Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-19 16:36:02 -08:00
Brian Behlendorf 06d461ee7b Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-19 16:35:43 -08:00
Brian Behlendorf 66be6018a5 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-19 16:35:27 -08:00
Brian Behlendorf dad4dd0dd4 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 16:35:17 -08:00
Brian Behlendorf 8806156f06 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 16:34:57 -08:00
Brian Behlendorf 6fdfd55847 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 16:34:48 -08:00
Brian Behlendorf 3f0c49cfa4 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 16:34:38 -08:00
Brian Behlendorf cbc70456f1 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 16:34:10 -08:00
Brian Behlendorf 0868f08291 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-19 16:33:37 -08:00
Brian Behlendorf 809ca413e5 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 16:33:03 -08:00
Brian Behlendorf 96813619bf Pull in new background scrubber 2008-12-19 16:29:13 -08:00
Brian Behlendorf 62e32a4204 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 16:27:13 -08:00
Brian Behlendorf 6f718e396c Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 16:27:08 -08:00
Brian Behlendorf 50c5923533 Resolve lingering atomic asm build issues. I think 2008-12-19 16:23:26 -08:00
Brian Behlendorf 3d2e368e7a Refresh autogen products 2008-12-19 16:12:00 -08:00
Brian Behlendorf 5dfaca6f13 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 16:11:17 -08:00
Brian Behlendorf 449c6c9e8b Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 16:11:13 -08:00
Brian Behlendorf 0581ade42b Add target_cpu 2008-12-19 16:07:26 -08:00
Brian Behlendorf 6b42c7a1b8 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 16:03:19 -08:00
Brian Behlendorf 1974fe42c2 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 16:03:07 -08:00
Brian Behlendorf b66eafc892 Add assembler flags 2008-12-19 15:56:04 -08:00
Brian Behlendorf caf661b2d5 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 15:13:35 -08:00
Brian Behlendorf 23eb8e4234 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 15:13:32 -08:00
Brian Behlendorf febd743891 First pass at getting userspace 64bit atomic ops working: 2008-12-19 15:11:43 -08:00
Brian Behlendorf ecdf940cb3 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 13:58:46 -08:00
Brian Behlendorf 8dbb32f117 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 13:58:44 -08:00
Brian Behlendorf 545f76d526 Add P2BOUNDARY macro 2008-12-19 13:56:55 -08:00
Brian Behlendorf 72838551b8 Refresh autogen products 2008-12-19 13:40:18 -08:00
Brian Behlendorf c311f43494 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 13:38:55 -08:00
Brian Behlendorf d6013ca22b Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-19 13:38:47 -08:00
Brian Behlendorf 3579c5ac5a Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-19 13:38:38 -08:00
Brian Behlendorf f5d11f37bd Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-19 13:38:29 -08:00
Brian Behlendorf d04ad444b9 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 13:38:25 -08:00
Brian Behlendorf fbc711944c Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 13:38:16 -08:00
Brian Behlendorf f4ff14afdb Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 13:38:11 -08:00
Brian Behlendorf 0127d5e65b Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 13:38:07 -08:00
Brian Behlendorf 4679c1631c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 13:37:55 -08:00
Brian Behlendorf 102a98af37 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-19 13:37:40 -08:00
Brian Behlendorf d1f5be0b8b Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 13:37:23 -08:00
Brian Behlendorf 8ab575cd8e Remove vdev_disk.c from userspace build, we simply use vdev_file.c here 2008-12-19 13:35:29 -08:00
Brian Behlendorf 24c4f2e309 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 13:16:50 -08:00
Brian Behlendorf b95f799218 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 13:16:48 -08:00
Brian Behlendorf 28edfc91c8 Add compress header 2008-12-19 13:14:49 -08:00
Brian Behlendorf b366379720 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 12:40:13 -08:00
Brian Behlendorf 338dd65c10 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 12:40:02 -08:00
Brian Behlendorf b86297e4d3 Add missing umem bits 2008-12-19 12:32:08 -08:00
Brian Behlendorf c7551d20b3 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 12:22:12 -08:00
Brian Behlendorf 553ed5a642 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 12:22:08 -08:00
Brian Behlendorf 55c0063df6 Add 2 more headers where are missing 2008-12-19 12:18:59 -08:00
Brian Behlendorf 15f1c7fd8e Refresh autogen products 2008-12-19 12:12:02 -08:00
Brian Behlendorf ea7cab3c8e Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 12:11:26 -08:00
Brian Behlendorf 0b750e64a3 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 12:11:12 -08:00
Brian Behlendorf 87dc99c933 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-19 12:11:09 -08:00
Brian Behlendorf ee2e34a7a5 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-19 12:10:50 -08:00
Brian Behlendorf 6216d4cd8a Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-19 12:10:34 -08:00
Brian Behlendorf b660663ca7 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 12:10:24 -08:00
Brian Behlendorf eb4c53562b Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 12:10:06 -08:00
Brian Behlendorf fef6be057e Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 12:09:57 -08:00
Brian Behlendorf bb5b627011 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 12:09:48 -08:00
Brian Behlendorf 8e9ab16b20 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 12:09:23 -08:00
Brian Behlendorf 78f7affc44 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-19 12:08:57 -08:00
Brian Behlendorf 3ce12f6815 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 12:08:24 -08:00
Brian Behlendorf e485017676 Remove spa_boot from userspace build 2008-12-19 12:04:45 -08:00
Brian Behlendorf f72a142146 Strip out sunddi support, this can be done in context 2008-12-19 12:04:07 -08:00
Brian Behlendorf 7113cd69f5 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 11:57:27 -08:00
Brian Behlendorf 5f0e8b8d91 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 11:57:25 -08:00
Brian Behlendorf 273cbc844a Fix trailing 'a' char 2008-12-19 11:55:38 -08:00
Brian Behlendorf a6bda2c1b5 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 11:50:11 -08:00
Brian Behlendorf 02bef1e61b Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 11:50:09 -08:00
Brian Behlendorf f9a746f44f Flesh out some more of the sunddi 2008-12-19 11:48:21 -08:00
Brian Behlendorf 70d3d22ccb Refresh autogen products 2008-12-19 11:36:16 -08:00
Brian Behlendorf 5eb924f9e8 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 11:32:35 -08:00
Brian Behlendorf b8e10bfc20 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 11:32:33 -08:00
Brian Behlendorf 615168d176 Stub out additional sunddi interfaces 2008-12-19 11:30:42 -08:00
Brian Behlendorf 904c8b37c4 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 11:14:56 -08:00
Brian Behlendorf 1fb4f38e73 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 11:14:55 -08:00
Brian Behlendorf ce80c4a422 Add utsname.h header 2008-12-19 11:13:07 -08:00
Brian Behlendorf 63a40005a1 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 10:20:03 -08:00
Brian Behlendorf 08ecd85f89 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-19 10:19:53 -08:00
Brian Behlendorf 726f45d53d Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-19 10:19:42 -08:00
Brian Behlendorf bc5f8da7f6 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-19 10:19:32 -08:00
Brian Behlendorf 9b02e8cb72 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 10:19:27 -08:00
Brian Behlendorf 7ef56c4e1c Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 10:19:17 -08:00
Brian Behlendorf 1a238799ba Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 10:19:12 -08:00
Brian Behlendorf 42e7e0b017 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 10:19:07 -08:00
Brian Behlendorf a577858f33 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 10:18:53 -08:00
Brian Behlendorf 41016312ae Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-19 10:18:36 -08:00
Brian Behlendorf 143bd1614e Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 10:18:16 -08:00
Brian Behlendorf 9de4108779 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 10:18:12 -08:00
Brian Behlendorf 3e2e5c4535 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-19 10:18:12 -08:00
Brian Behlendorf a68af79057 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-19 10:18:11 -08:00
Brian Behlendorf d4c39af7a6 Re-add KM_PUSHPAGE 2008-12-19 10:15:52 -08:00
Brian Behlendorf 330840ff2e Re-add KM_PUSHPAGE 2008-12-19 10:15:27 -08:00
Brian Behlendorf 30861da8a8 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 10:11:33 -08:00
Brian Behlendorf b6d881a293 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 10:11:30 -08:00
Brian Behlendorf 75b98b396b Add missing VM types 2008-12-19 10:09:35 -08:00
Brian Behlendorf a9e7b6fc2f Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 10:03:34 -08:00
Brian Behlendorf 67b265106b Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 10:03:31 -08:00
Brian Behlendorf 8578673221 Add DTRACE_PROBE(a) macro 2008-12-19 10:01:38 -08:00
Brian Behlendorf 62f6c8fe77 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 09:54:53 -08:00
Brian Behlendorf fa6f423f31 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-19 09:54:43 -08:00
Brian Behlendorf cd0966054f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-19 09:54:32 -08:00
Brian Behlendorf b164745a8d Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-19 09:54:21 -08:00
Brian Behlendorf 530b2e6564 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 09:54:15 -08:00
Brian Behlendorf e17e93da32 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 09:54:04 -08:00
Brian Behlendorf ec916d278e Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 09:53:57 -08:00
Brian Behlendorf 9a20c1615b Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 09:53:52 -08:00
Brian Behlendorf 1a0d43ceac Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 09:53:37 -08:00
Brian Behlendorf 10fd4b002f Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-19 09:53:17 -08:00
Brian Behlendorf 24e15d1bb1 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 09:52:57 -08:00
Brian Behlendorf 2d0ae2710c Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 09:52:53 -08:00
Brian Behlendorf 5906903384 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-19 09:52:52 -08:00
Brian Behlendorf 3d8832a795 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-19 09:52:51 -08:00
Brian Behlendorf 3bc48c3e74 Missing func readd 2008-12-19 09:50:15 -08:00
Brian Behlendorf 111303eeb8 context 2008-12-19 09:47:09 -08:00
Brian Behlendorf dbc567603d Readd removed hunk 2008-12-19 09:39:17 -08:00
Brian Behlendorf 2c874ef298 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 09:32:53 -08:00
Brian Behlendorf 56217b4c11 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 09:32:50 -08:00
Brian Behlendorf cdcb2af79b Add proper header 2008-12-19 09:30:56 -08:00
Brian Behlendorf 7cf32c82f6 Refresh autogen products 2008-12-19 09:25:52 -08:00
Brian Behlendorf 9ea2ed5b47 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 09:08:07 -08:00
Brian Behlendorf 1e0f1b2c02 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 09:08:03 -08:00
Brian Behlendorf a1e023d7a4 Add strtoxx functions 2008-12-19 09:05:50 -08:00
Brian Behlendorf 3da25300e3 Refresh autogen products 2008-12-18 14:02:22 -08:00
Brian Behlendorf 896e89ac4a Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-18 13:20:15 -08:00
Brian Behlendorf acfcb00a6e Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-18 13:20:04 -08:00
Brian Behlendorf 97a0b13aec Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-18 13:19:54 -08:00
Brian Behlendorf 0beb23495e Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-18 13:19:44 -08:00
Brian Behlendorf dddf2efadf Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-18 13:19:38 -08:00
Brian Behlendorf 7299994fcf Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-18 13:19:28 -08:00
Brian Behlendorf 1eaa464a82 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-18 13:19:22 -08:00
Brian Behlendorf 155929dfcd Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-18 13:19:17 -08:00
Brian Behlendorf e6169bf282 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 13:19:03 -08:00
Brian Behlendorf e55e3643df Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-18 13:18:46 -08:00
Brian Behlendorf da1ceb2bbe Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-18 13:18:27 -08:00
Brian Behlendorf 72bf32a79f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 13:18:19 -08:00
Brian Behlendorf 844a9ced6d Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-18 13:18:17 -08:00
Brian Behlendorf 33e499be43 Merge branch 'fix-stack' into refs/top-bases/fix-branch 2008-12-18 13:18:15 -08:00
Brian Behlendorf 8e136cf0c9 Add noinline macro for userspace 2008-12-18 13:15:58 -08:00
Brian Behlendorf 0172b08863 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-18 10:03:25 -08:00
Brian Behlendorf 16dc43525b Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-18 10:03:15 -08:00
Brian Behlendorf dc78b79ec8 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-18 10:03:05 -08:00
Brian Behlendorf 412a212afe Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-18 10:02:56 -08:00
Brian Behlendorf 7d3b45b517 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-18 10:02:51 -08:00
Brian Behlendorf bf922798ae Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-18 10:02:41 -08:00
Brian Behlendorf 2956fc01be Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-18 10:02:36 -08:00
Brian Behlendorf 8fa18afc2e Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-18 10:02:32 -08:00
Brian Behlendorf c5472b82d0 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 10:02:19 -08:00
Brian Behlendorf ed5b55e3b2 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-18 10:02:02 -08:00
Brian Behlendorf 4d86e8fa92 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-18 10:01:44 -08:00
Brian Behlendorf 0a353443cd Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 10:01:41 -08:00
Brian Behlendorf 9c0846462b Resolve conflict 2008-12-18 10:01:37 -08:00
Brian Behlendorf 4df7b421a1 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-18 10:00:46 -08:00
Brian Behlendorf 25a3fca866 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 10:00:45 -08:00
Brian Behlendorf 9e195d0cbf Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-18 10:00:44 -08:00
Brian Behlendorf c8f253cda8 Now fixed in fix-pthreads branch 2008-12-18 09:58:42 -08:00
Brian Behlendorf 229aba2943 Properly cast thread functions for pthreads 2008-12-18 09:56:22 -08:00
Brian Behlendorf 893ed2fad0 Properly cast thread functions for pthreads 2008-12-18 09:56:05 -08:00
Brian Behlendorf c037865684 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-18 09:40:10 -08:00
Brian Behlendorf d511dad31e Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-18 09:40:07 -08:00
Brian Behlendorf 5915f86ab1 Add callb.h header 2008-12-18 09:38:10 -08:00
Brian Behlendorf 1c78d7d61d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-18 09:36:25 -08:00
Brian Behlendorf fe5b927a4a Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-18 09:36:22 -08:00
Brian Behlendorf 0a6ac25d10 Add vmem_ interface mapping for user space 2008-12-18 09:34:27 -08:00
Brian Behlendorf e637016382 Refresh autogen products 2008-12-17 16:48:35 -08:00
Brian Behlendorf addd4c977d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 16:47:36 -08:00
Brian Behlendorf c90836a39f Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-17 16:47:17 -08:00
Brian Behlendorf 86bc861773 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-17 16:46:59 -08:00
Brian Behlendorf 853f23dfa8 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-17 16:46:43 -08:00
Brian Behlendorf 58e5869872 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-17 16:46:10 -08:00
Brian Behlendorf 56d78748f6 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-17 16:45:57 -08:00
Brian Behlendorf 7053ff3e65 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-17 16:45:45 -08:00
Brian Behlendorf eb8725f0f8 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-17 16:45:15 -08:00
Brian Behlendorf 95158f8107 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-17 16:44:35 -08:00
Brian Behlendorf c27a2516c2 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-17 16:43:55 -08:00
Brian Behlendorf f799177730 Add all sources for libzfs userspace funcationality 2008-12-17 16:39:45 -08:00
Brian Behlendorf 546961cdc0 Add autogen products 2008-12-17 16:24:56 -08:00
Brian Behlendorf 0b022545bf Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 16:08:11 -08:00
Brian Behlendorf 8b33b8f8cd Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-17 16:08:05 -08:00
Brian Behlendorf 0f7520c7b0 Add gethrtime 2008-12-17 16:04:10 -08:00
Brian Behlendorf 210f3e716a Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 16:00:34 -08:00
Brian Behlendorf b07886e188 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-17 16:00:29 -08:00
Brian Behlendorf 9ab4c93028 Wrap more stuff in HAVE_ZPL 2008-12-17 15:58:20 -08:00
Brian Behlendorf 35fe8215ef Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 15:35:43 -08:00
Brian Behlendorf 9877a35f9f Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-17 15:35:41 -08:00
Brian Behlendorf 06005641bb Stub out mount/share related func 2008-12-17 15:33:45 -08:00
Brian Behlendorf 7278ab4224 Refresh autogen products 2008-12-17 14:51:43 -08:00
Brian Behlendorf 89494374b0 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 14:36:45 -08:00
Brian Behlendorf 99a4e4a121 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-17 14:36:43 -08:00
Brian Behlendorf e3150dafb7 Add getexecname to Makefile.am 2008-12-17 14:34:48 -08:00
Brian Behlendorf 25fdaadeb0 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 14:16:22 -08:00
Brian Behlendorf 6a0d0cbd0f Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-17 14:16:20 -08:00
Brian Behlendorf 370f0a1773 Add zone and getmntany sources 2008-12-17 14:14:23 -08:00
Brian Behlendorf 8e0b1b519e Refresh autogen products 2008-12-17 13:39:34 -08:00
Brian Behlendorf fd77571d28 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 13:38:46 -08:00
Brian Behlendorf c1e34481d8 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-17 13:38:38 -08:00
Brian Behlendorf 0590c2a818 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-17 13:38:28 -08:00
Brian Behlendorf cd76848d7c Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-17 13:38:19 -08:00
Brian Behlendorf 6a6463a6a6 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-17 13:38:05 -08:00
Brian Behlendorf 4a07f548c1 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-17 13:38:01 -08:00
Brian Behlendorf 17ce6fed40 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-17 13:37:56 -08:00
Brian Behlendorf cacdbdba2f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-17 13:37:44 -08:00
Brian Behlendorf 7139f15b92 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-17 13:37:27 -08:00
Brian Behlendorf 3be083292c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-17 13:37:10 -08:00
Brian Behlendorf ba3d5afa54 Add missing \ 2008-12-17 13:35:06 -08:00
Brian Behlendorf effc496583 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 11:37:56 -08:00
Brian Behlendorf 33b73cd800 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-17 11:37:48 -08:00
Brian Behlendorf e91e5900c3 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-17 11:37:38 -08:00
Brian Behlendorf 0e1addbcc1 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-17 11:37:29 -08:00
Brian Behlendorf bda39e3f52 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-17 11:37:16 -08:00
Brian Behlendorf 8d0ab2e4a0 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-17 11:37:11 -08:00
Brian Behlendorf bdd147eb8b Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-17 11:37:07 -08:00
Brian Behlendorf 3cf4e51b1c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-17 11:36:55 -08:00
Brian Behlendorf 858f1f329a Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-17 11:36:39 -08:00
Brian Behlendorf e0f0e02636 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-17 11:36:22 -08:00
Brian Behlendorf 5ea99efac7 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 11:36:20 -08:00
Brian Behlendorf 676ab35598 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-17 11:36:19 -08:00
Brian Behlendorf 0106dabb11 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-17 11:36:18 -08:00
Brian Behlendorf a681d70e28 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 11:36:17 -08:00
Brian Behlendorf e532f6bef4 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 11:36:16 -08:00
Brian Behlendorf 8af904a4b0 Resolve index shadowing /usr/include/string.h:304 2008-12-17 11:34:19 -08:00
Brian Behlendorf ed9a35324d Not sure why Sun needed to remove these externs, but I need them back 2008-12-17 11:32:47 -08:00
Brian Behlendorf 7c5c932505 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 11:28:54 -08:00
Brian Behlendorf d8a55bcb89 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-17 11:28:46 -08:00
Brian Behlendorf 100e5ebb03 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-17 11:28:37 -08:00
Brian Behlendorf 84cf167e93 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-17 11:28:29 -08:00
Brian Behlendorf 199eaf1874 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-17 11:28:16 -08:00
Brian Behlendorf 2ad946619e Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-17 11:28:11 -08:00
Brian Behlendorf 44f4c483bc Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-17 11:28:07 -08:00
Brian Behlendorf 5cbfff3589 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-17 11:27:55 -08:00
Brian Behlendorf a4b3bb43a9 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-17 11:27:40 -08:00
Brian Behlendorf 01e5ef8ebe Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-17 11:27:23 -08:00
Brian Behlendorf 25db7e9413 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 11:27:21 -08:00
Brian Behlendorf 935fd6c681 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 11:27:20 -08:00
Brian Behlendorf 55c8582174 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 11:27:19 -08:00
Brian Behlendorf dcf0fb9ffb Resolve shadow conflicts 2008-12-17 11:25:21 -08:00
Brian Behlendorf 3932b368f5 Refresh autogen products 2008-12-17 11:20:04 -08:00
Brian Behlendorf 38510987aa Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 11:19:30 -08:00
Brian Behlendorf e5191c5ed5 Resolve conflict 2008-12-17 11:19:19 -08:00
Brian Behlendorf a2b11e4955 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-17 11:18:33 -08:00
Brian Behlendorf 64d5108c1f Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-17 11:18:24 -08:00
Brian Behlendorf 35257bfbd6 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-17 11:18:11 -08:00
Brian Behlendorf 47d0dbf5f6 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-17 11:18:07 -08:00
Brian Behlendorf 27448c8cdb Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-17 11:18:02 -08:00
Brian Behlendorf 6f2638f7a3 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-17 11:17:50 -08:00
Brian Behlendorf 8fd272bb0f Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-17 11:17:34 -08:00
Brian Behlendorf 746c17afcf Resolve conflict 2008-12-17 11:16:41 -08:00
Brian Behlendorf 7973e77bfc Re-add zpool (part of it), we need to build it for the common bits 2008-12-17 11:12:06 -08:00
Brian Behlendorf 1b7fa2b0b2 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 10:45:02 -08:00
Brian Behlendorf 1ef609d29e Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-17 10:45:00 -08:00
Brian Behlendorf 4291b2e02f Add locale.h 2008-12-17 10:43:06 -08:00
Brian Behlendorf 3d74e14dda Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 10:12:34 -08:00
Brian Behlendorf 5ce03568c6 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-17 10:12:32 -08:00
Brian Behlendorf e23605530a Update #ifndef/#defines 2008-12-17 10:10:32 -08:00
Brian Behlendorf 6d524f2906 Cleanup some of the #ifndef/#defines 2008-12-17 10:06:55 -08:00
Brian Behlendorf 07394c4b64 Add mkdev.h rename _SOL_SYS to _LIBSPL_SYS 2008-12-17 10:04:04 -08:00
Brian Behlendorf 994a616c30 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 09:50:58 -08:00
Brian Behlendorf 204ec2e8f4 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-17 09:50:56 -08:00
Brian Behlendorf 0b7ef284bd Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-17 09:50:55 -08:00
Brian Behlendorf bcbf74fead Remove assert/verify support from zfs_context, moved to assert.h 2008-12-17 09:49:02 -08:00
Brian Behlendorf 5945ae3161 Move verify/assert userspace functionality to libspl to simply everything, this way it only lives in one place where you need to build with libzfs.h or zfs_context.h 2008-12-17 09:43:11 -08:00
Brian Behlendorf d6ad828907 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 16:39:13 -08:00
Brian Behlendorf 5c9d50894c Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-16 16:39:02 -08:00
Brian Behlendorf 8ad2f7697a Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-16 16:38:48 -08:00
Brian Behlendorf c76494c348 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-16 16:38:17 -08:00
Brian Behlendorf 6078c0a99e Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-16 16:37:47 -08:00
Brian Behlendorf daa6dfed96 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 16:37:05 -08:00
Brian Behlendorf 4ece62233d Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-16 16:36:52 -08:00
Brian Behlendorf 8f160abede Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-16 16:36:39 -08:00
Brian Behlendorf 8ffad5b6c0 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 16:35:57 -08:00
Brian Behlendorf 158d07270f Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-16 16:35:09 -08:00
Brian Behlendorf 715ac6ca88 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 16:34:16 -08:00
Brian Behlendorf 7453ec0f2c Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 16:34:09 -08:00
Brian Behlendorf 8bed8da925 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 16:34:07 -08:00
Brian Behlendorf 2d7f255945 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 16:34:04 -08:00
Brian Behlendorf ebab24f633 Resolve shadow conflict 2008-12-16 16:26:50 -08:00
Brian Behlendorf f1f205e15e Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 16:22:47 -08:00
Brian Behlendorf 2d271e7a94 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-16 16:22:42 -08:00
Brian Behlendorf 3d34904fbb Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-16 16:22:34 -08:00
Brian Behlendorf 750332e323 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-16 16:22:15 -08:00
Brian Behlendorf f4b3b4ea9c Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-16 16:21:58 -08:00
Brian Behlendorf 015fcbe3b2 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 16:21:32 -08:00
Brian Behlendorf 5477876bdb Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-16 16:21:25 -08:00
Brian Behlendorf a56dee01f5 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-16 16:21:17 -08:00
Brian Behlendorf 94dd45c46d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 16:20:54 -08:00
Brian Behlendorf b5550a0079 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-16 16:20:25 -08:00
Brian Behlendorf 6a902fe21c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 16:19:56 -08:00
Brian Behlendorf f2bc2f7b6f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 16:19:52 -08:00
Brian Behlendorf fd4da48000 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 16:19:50 -08:00
Brian Behlendorf 29be0d44ba Resolve conflict 2008-12-16 16:19:46 -08:00
Brian Behlendorf 4d21a1c977 Resolve two more shadow conflicts 2008-12-16 16:14:19 -08:00
Brian Behlendorf 71140ec4ac Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 16:10:20 -08:00
Brian Behlendorf 4ee4891d66 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-16 16:10:16 -08:00
Brian Behlendorf 862436f8c9 Strip out userspace interface to mount the FS. I need to talk about the right way to manage these changes with the lustre group at Sun, and see where they stand 2008-12-16 16:06:24 -08:00
Brian Behlendorf ef733219dc Refresh autogen products 2008-12-16 15:53:34 -08:00
Brian Behlendorf 26b307d0d0 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 15:52:53 -08:00
Brian Behlendorf f50ed8e8c6 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-16 15:52:50 -08:00
Brian Behlendorf 1f5373d772 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-16 15:52:46 -08:00
Brian Behlendorf cf408f0187 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-16 15:52:37 -08:00
Brian Behlendorf 4a0630d83e Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-16 15:52:28 -08:00
Brian Behlendorf 70c7936ebf Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 15:52:15 -08:00
Brian Behlendorf bad9c6965c Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-16 15:52:11 -08:00
Brian Behlendorf afc91005b1 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-16 15:52:06 -08:00
Brian Behlendorf cc53801767 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 15:51:54 -08:00
Brian Behlendorf a77d20e66b Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-16 15:51:39 -08:00
Brian Behlendorf e5000a1073 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 15:51:22 -08:00
Brian Behlendorf 12c13fbafb Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 15:51:20 -08:00
Brian Behlendorf 4583b6d5ba Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 15:51:19 -08:00
Brian Behlendorf e14e140b52 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 15:51:19 -08:00
Brian Behlendorf 3c515284a6 Remove double declaration of char * 2008-12-16 15:49:21 -08:00
Brian Behlendorf f73c835830 Add include patch to pick up fletcher.c which for some unknown reason is included instead of simply being build as source. This should be fixed eventually, but it is how the OpenSolaris source handles it. 2008-12-16 15:44:02 -08:00
Brian Behlendorf 4bed7d4e49 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 15:34:52 -08:00
Brian Behlendorf 7e43e16395 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-16 15:34:50 -08:00
Brian Behlendorf 35f607040f Wrap additional new efi code in HAVE_LIBEFI macros 2008-12-16 15:33:00 -08:00
Brian Behlendorf f1a115a43b Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 15:22:50 -08:00
Brian Behlendorf 6e002c41b8 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-16 15:22:48 -08:00
Brian Behlendorf a3ea268b72 Add 2 missing headers 2008-12-16 15:20:56 -08:00
Brian Behlendorf 59a704e2e1 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 15:17:55 -08:00
Brian Behlendorf ca161b928b Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-16 15:17:54 -08:00
Brian Behlendorf 36722eee12 Comment out most of the file until ZPL support arrives 2008-12-16 15:16:04 -08:00
Brian Behlendorf 618ef3269b Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 14:45:33 -08:00
Brian Behlendorf 6d01a82ce5 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:45:32 -08:00
Brian Behlendorf ef919ac403 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:45:31 -08:00
Brian Behlendorf 66587f0fee Remove all the share stuff 2008-12-16 14:43:38 -08:00
Brian Behlendorf 66cf9db3d0 Remove non-existing systeminfo ref 2008-12-16 14:38:52 -08:00
Brian Behlendorf af860a0ef2 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 14:35:27 -08:00
Brian Behlendorf 646230294f Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-16 14:35:24 -08:00
Brian Behlendorf 1f0ad04f2d Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:35:21 -08:00
Brian Behlendorf dbd5e397c5 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-16 14:35:20 -08:00
Brian Behlendorf 56692ac3aa Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-16 14:35:12 -08:00
Brian Behlendorf c75e9b1c12 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-16 14:35:03 -08:00
Brian Behlendorf e213f59844 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 14:34:51 -08:00
Brian Behlendorf b17ad01f98 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-16 14:34:47 -08:00
Brian Behlendorf 5840198e26 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-16 14:34:43 -08:00
Brian Behlendorf a4c93e56cc Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 14:34:31 -08:00
Brian Behlendorf bb20fd94fc Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-16 14:34:17 -08:00
Brian Behlendorf 047a942f42 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 14:34:01 -08:00
Brian Behlendorf 79bc1b23ed Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 14:33:59 -08:00
Brian Behlendorf 804830a231 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 14:33:59 -08:00
Brian Behlendorf a8a0f9ea2a Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 14:33:58 -08:00
Brian Behlendorf 9439fbdcd3 Add systeminfo 2008-12-16 14:32:03 -08:00
Brian Behlendorf 53c0cdbc42 Resolve dirname shadow conflict with /usr/include/libgen.h:27 dirname 2008-12-16 14:29:35 -08:00
Brian Behlendorf 01db543e50 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 14:24:24 -08:00
Brian Behlendorf 2c2372389a Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:24:23 -08:00
Brian Behlendorf 7df95c2f31 Add missing header 2008-12-16 14:22:31 -08:00
Brian Behlendorf 33dc3053c0 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 14:19:57 -08:00
Brian Behlendorf e583bf8b9e Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:19:55 -08:00
Brian Behlendorf f6207ec73a Add missing headers 2008-12-16 14:17:29 -08:00
Brian Behlendorf 8417375410 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 14:12:50 -08:00
Brian Behlendorf 52a453edaa Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:12:48 -08:00
Brian Behlendorf 9df591c9d3 Add sys/mount.h header 2008-12-16 14:10:43 -08:00
Brian Behlendorf a7eef78148 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 14:07:02 -08:00
Brian Behlendorf 554defd465 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:07:00 -08:00
Brian Behlendorf 12cb53ce52 Make SHARENFS condition with ZPL 2008-12-16 14:05:09 -08:00
Brian Behlendorf 2b2ceaed9b Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 13:31:49 -08:00
Brian Behlendorf a07043191d Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-16 13:31:46 -08:00
Brian Behlendorf ac3a2f3476 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-16 13:31:42 -08:00
Brian Behlendorf 9af5c86c0c Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-16 13:31:33 -08:00
Brian Behlendorf 7bd9ab13e9 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-16 13:31:25 -08:00
Brian Behlendorf 33072dc1bc Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 13:31:13 -08:00
Brian Behlendorf 48b059e690 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-16 13:31:08 -08:00
Brian Behlendorf 2f68235cc8 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-16 13:31:04 -08:00
Brian Behlendorf 751ee4041e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 13:30:53 -08:00
Brian Behlendorf 8342056a8a Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-16 13:30:38 -08:00
Brian Behlendorf 1d4b1187d7 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 13:30:23 -08:00
Brian Behlendorf 527e38c72b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 13:30:21 -08:00