Commit Graph

1795 Commits

Author SHA1 Message Date
Brian Behlendorf 23f5686f20 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-07 14:09:10 -07:00
Brian Behlendorf 96ddc12975 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-07-07 14:08:35 -07:00
Brian Behlendorf 02bc7929d4 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-07 14:08:22 -07:00
Brian Behlendorf 1ff9c70da3 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:

	lib/libzfs/libzfs_dataset.c
2009-07-07 14:04:47 -07:00
Brian Behlendorf 34422f0ffa Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-07 13:50:32 -07:00
Brian Behlendorf 47502cd94b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-07 13:50:31 -07:00
Brian Behlendorf fb26df15c8 Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2009-07-07 13:50:30 -07:00
Brian Behlendorf cad9fa40e1 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-07-07 13:50:29 -07:00
Brian Behlendorf a2423197e1 Resolve missing cast warning 2009-07-07 13:41:51 -07:00
Brian Behlendorf 361e0e7685 Fix newly introduced missing braces warnings for gcc. 2009-07-07 13:40:16 -07:00
Brian Behlendorf ee92267c38 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-07-07 13:20:40 -07:00
Brian Behlendorf 9661d38088 Add topic branch to conditionally remove idmap support. The
only things currently like this on linux appears in the nfs v4
implementation of idmap.  For now we can do with out.
2009-07-07 13:16:24 -07:00
Brian Behlendorf 70804727b1 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-07-07 10:15:04 -07:00
Brian Behlendorf 5ae3e75ace Wrap new sysevent includes in HAVE_SYSEVENT ifdef 2009-07-07 10:07:23 -07:00
Brian Behlendorf a6b1465e30 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
Conflicts:

	module/zfs/include/sys/zfs_fuid.h
	module/zfs/zfs_fuid.c
	module/zfs/zfs_ioctl.c
	module/zfs/zfs_vfsops.c
	module/zfs/zfs_znode.c
2009-07-06 15:16:54 -07:00
Brian Behlendorf 6e96712c9a Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-07-06 15:09:25 -07:00
Brian Behlendorf ab16fdc9ad Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-06 15:09:10 -07:00
Brian Behlendorf 409cfe5051 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
Conflicts:

	lib/libzfs/libzfs_pool.c
2009-07-06 15:05:47 -07:00
Brian Behlendorf beac3749a1 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-07-06 15:04:17 -07:00
Brian Behlendorf 2b582c34cb Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
Conflicts:

	module/zfs/zfs_ioctl.c
2009-07-06 15:03:54 -07:00
Brian Behlendorf b56250900b Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-06 15:02:55 -07:00
Brian Behlendorf 266a7d8cd7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
Conflicts:

	module/zcommon/zfs_namecheck.c
	module/zfs/spa.c
	module/zfs/vdev.c
	module/zfs/zap_micro.c
2009-07-06 13:47:04 -07:00
Brian Behlendorf 6c3580cc05 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-07-06 13:44:42 -07:00
Brian Behlendorf 053043b2d0 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
Conflicts:

	lib/libzfs/libzfs_pool.c
2009-07-06 13:44:19 -07:00
Brian Behlendorf 149c4b2731 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:

	cmd/ztest/ztest.c
	lib/libzfs/libzfs_pool.c
	module/zcommon/zfs_namecheck.c
	module/zfs/dmu.c
	module/zfs/include/sys/dmu.h
	module/zfs/include/sys/zfs_fuid.h
	module/zfs/spa.c
	module/zfs/vdev.c
	module/zfs/zap_micro.c
	module/zfs/zfs_fuid.c
	module/zfs/zfs_ioctl.c
	module/zfs/zfs_vfsops.c
	module/zfs/zfs_znode.c
2009-07-06 13:40:29 -07:00
Brian Behlendorf 658459249e Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-06 13:17:28 -07:00
Brian Behlendorf cd098f87c8 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
Conflicts:

	cmd/ztest/ztest.c
2009-07-06 13:16:29 -07:00
Brian Behlendorf 326bb586bd Merge commit 'refs/top-bases/fix-stack' into fix-stack 2009-07-06 13:13:20 -07:00
Brian Behlendorf e320858042 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2009-07-06 13:12:54 -07:00
Brian Behlendorf 01c3cfc58f Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
Conflicts:

	module/zfs/zil.c
2009-07-06 13:12:23 -07:00
Brian Behlendorf a1ccb00b7e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
Conflicts:

	cmd/ztest/ztest.c
	module/zfs/zil.c
2009-07-06 13:11:34 -07:00
Brian Behlendorf 480b03791d Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
Conflicts:

	lib/libzfs/libzfs_dataset.c
2009-07-02 17:07:52 -07:00
Brian Behlendorf a06a428e15 Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
Conflicts:

	cmd/zdb/zdb_il.c
	cmd/zinject/zinject.c
	lib/libzfs/libzfs_graph.c
	module/zcommon/include/sys/fm/fs/zfs.h
	module/zcommon/include/zfs_deleg.h
	module/zcommon/include/zfs_namecheck.h
	module/zcommon/zfs_deleg.c
	module/zcommon/zfs_namecheck.c
	module/zcommon/zprop_common.c
	module/zfs/dmu_object.c
	module/zfs/dsl_prop.c
	module/zfs/fletcher.c
	module/zfs/include/sys/dsl_deleg.h
	module/zfs/include/sys/dsl_prop.h
	module/zfs/include/sys/metaslab_impl.h
	module/zfs/include/sys/spa_boot.h
	module/zfs/include/sys/zap.h
	module/zfs/include/sys/zap_impl.h
	module/zfs/include/sys/zfs_context.h
	module/zfs/include/sys/zfs_ctldir.h
	module/zfs/include/sys/zfs_dir.h
	module/zfs/include/sys/zfs_fuid.h
	module/zfs/include/sys/zfs_ioctl.h
	module/zfs/spa_errlog.c
	module/zfs/spa_history.c
	module/zfs/zap.c
	module/zfs/zap_leaf.c
	module/zfs/zap_micro.c
2009-07-02 17:06:20 -07:00
Brian Behlendorf 244d656e28 Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
Conflicts:

	module/zfs/dmu.c
2009-07-02 16:59:39 -07:00
Brian Behlendorf 44703f0029 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
Conflicts:

	lib/libzfs/libzfs_dataset.c
	module/zfs/arc.c
	module/zfs/spa.c
2009-07-02 16:57:09 -07:00
Brian Behlendorf eb0137f395 Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
Conflicts:

	lib/libzfs/libzfs_dataset.c
	module/zfs/arc.c
	module/zfs/dmu_objset.c
	module/zfs/dsl_pool.c
	module/zfs/spa.c
	module/zfs/zfs_ioctl.c
2009-07-02 16:55:22 -07:00
Brian Behlendorf b095bf444a Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
Conflicts:

	cmd/zfs/zfs_main.c
	lib/libzfs/libzfs_dataset.c
2009-07-02 16:50:53 -07:00
Brian Behlendorf e2b2597751 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Conflicts:

	cmd/zdb/zdb_il.c
	cmd/zfs/zfs_main.c
	cmd/zinject/zinject.c
	cmd/ztest/ztest.c
	lib/libzfs/libzfs_dataset.c
	lib/libzfs/libzfs_graph.c
	module/zcommon/include/sys/fm/fs/zfs.h
	module/zcommon/include/zfs_deleg.h
	module/zcommon/include/zfs_namecheck.h
	module/zcommon/zfs_deleg.c
	module/zcommon/zfs_namecheck.c
	module/zcommon/zprop_common.c
	module/zfs/arc.c
	module/zfs/dmu.c
	module/zfs/dmu_object.c
	module/zfs/dmu_objset.c
	module/zfs/dsl_pool.c
	module/zfs/dsl_prop.c
	module/zfs/fletcher.c
	module/zfs/include/sys/dsl_deleg.h
	module/zfs/include/sys/dsl_prop.h
	module/zfs/include/sys/metaslab_impl.h
	module/zfs/include/sys/spa_boot.h
	module/zfs/include/sys/zap.h
	module/zfs/include/sys/zap_impl.h
	module/zfs/include/sys/zfs_context.h
	module/zfs/include/sys/zfs_ctldir.h
	module/zfs/include/sys/zfs_dir.h
	module/zfs/include/sys/zfs_fuid.h
	module/zfs/include/sys/zfs_ioctl.h
	module/zfs/spa.c
	module/zfs/spa_errlog.c
	module/zfs/spa_history.c
	module/zfs/zap.c
	module/zfs/zap_leaf.c
	module/zfs/zap_micro.c
	module/zfs/zfs_ioctl.c
	module/zfs/zio.c
2009-07-02 16:49:11 -07:00
Brian Behlendorf e9f14862a5 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Conflicts:

	module/zfs/dmu_objset.c
	module/zfs/spa.c
	module/zfs/vdev.c
	module/zfs/vdev_label.c
	module/zfs/zio.c
2009-07-02 16:18:03 -07:00
Brian Behlendorf 9babb37438 Rebase master to b117 2009-07-02 15:44:48 -07:00
Brian Behlendorf f2d80ee1f5 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-01 12:57:32 -07:00
Brian Behlendorf 255ef81e33 Fix 'make dist' on powerpc64 by include an atomic.S place holder file.
Add EXTRA_DIST atomic.c for powerpc64 to ensure source is packaged.
2009-07-01 12:49:10 -07:00
Brian Behlendorf 5974d1d85e Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-01 11:36:21 -07:00
Brian Behlendorf 63845164a6 Use $(RM) macro to ensure -f is passed.
Preserve path for installed headers with nobase.
2009-07-01 11:31:47 -07:00
Brian Behlendorf df388bfc0a Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-01 11:11:48 -07:00
Brian Behlendorf a5e9c5bc65 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-07-01 11:11:41 -07:00
Brian Behlendorf 685b7d85d3 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-01 11:11:34 -07:00
Brian Behlendorf d959a6177a Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-01 11:11:20 -07:00
Brian Behlendorf 518b58f35b Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-07-01 11:11:05 -07:00
Brian Behlendorf 10c43094ed Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-07-01 11:10:58 -07:00
Brian Behlendorf 212ecc6560 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-01 11:10:44 -07:00
Brian Behlendorf 8c684c8d85 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-01 11:10:24 -07:00
Brian Behlendorf f8ff6aa720 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-07-01 11:10:06 -07:00
Brian Behlendorf 95ab1a0980 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-01 11:09:59 -07:00
Brian Behlendorf b44445a8f1 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-01 11:09:33 -07:00
Brian Behlendorf ef0a712858 Distro friendly build system / packaging improvements.
These changes bring the zfs-0.4.4 tree in to compliance with
the spl-0.4.4 packaging changes.  The bottom line is 2 source
rpms and 4 binary rpms will now be generated when creating
packages there will be:

zfs-<version>.src.rpm
- Fully rebuildable source rpm for libzfs and utils.
zfs-modules-<version>.src.rpm
- Fully rebuildable source rpm for kernel modules.

zfs-<version>.<arch>.rpm
- Binary rpm for libzfs and utils.  The utils in this package are
  compatible with all zfs-module rpms of the same version.
zfs-devel-<version>.<arch>.rpm
- Binary rpm containing headers for building against libzfs libraries.

zfs-modules-<verion>-<kernel>.arch.rpm
- Binary rpm containing the kernel modules for a specific kernel build.
  The package name contains the kernel version and you should have one
  of these packages installed to match every kernel on your system.
zfs-modules-devel-<verion>-<kernel>.arch.rpm
- Binary rpm containing development header and module symbols needed
  for building additional kernel modules which are dependent on the
  zfs module stack.

Expect minor interations on these changes as I validate they work
properly on CHAOS, RHEL, Fedora, and SLES style distros.
2009-07-01 10:53:05 -07:00
Brian Behlendorf 727764d7a3 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-06-08 16:30:13 -07:00
Brian Behlendorf 3f3cebdcda libspl support for conditional SUBDIRs based on target arch 2009-06-08 16:10:12 -07:00
Brian Behlendorf bf426953af Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-05-22 16:38:30 -07:00
Brian Behlendorf 2486dd20e5 Set LP64 for powerpc64 and LP32 for just powerpc. 2009-05-22 16:27:59 -07:00
Brian Behlendorf 8bb2e455fb Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-05-22 15:07:27 -07:00
Brian Behlendorf b83a638936 Powerpc64 Compatibility
- Add 64-bit user space atomic support obtained from an old version
  of OpenSolaris which supported ppc.  They are not all 100% fully
  implemented by they are a good first step.
- Add powerpc ISA type.
- Strip out unused ISA defines to prevent any confusion.
2009-05-22 15:00:19 -07:00
Brian Behlendorf 4f2dfa3c94 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-19 21:13:11 -07:00
Brian Behlendorf df43fa9472 Merge commit 'refs/top-bases/linux-unused' into linux-unused
Conflicts:

	lib/libzpool/include/sys/zfs_context.h
2009-03-19 21:12:49 -07:00
Brian Behlendorf 37c55dde9f Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-19 21:11:46 -07:00
Brian Behlendorf a676a29d25 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-19 21:11:25 -07:00
Brian Behlendorf 59d17045c4 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-19 21:11:00 -07:00
Brian Behlendorf f87494c866 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
Conflicts:

	module/zfs/txg.c
2009-03-19 21:10:40 -07:00
Brian Behlendorf 4ed190513e Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-19 21:08:51 -07:00
Brian Behlendorf 275f4aae5d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
Conflicts:

	module/zfs/dmu_tx.c
2009-03-19 21:08:17 -07:00
Brian Behlendorf ddd2898eed Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-03-19 21:06:59 -07:00
Brian Behlendorf 0bdc8e0aec Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-19 21:06:46 -07:00
Brian Behlendorf 7f33364d3c Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
Conflicts:

	lib/libzpool/include/sys/zfs_context.h
	module/zfs/dmu_tx.c
	module/zfs/txg.c
2009-03-19 21:03:58 -07:00
Brian Behlendorf e7f02d3b41 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-19 20:59:33 -07:00
Brian Behlendorf eb811f7fa9 Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Conflicts:

	module/zfs/include/sys/dmu_tx.h
	module/zfs/include/sys/txg.h
2009-03-19 20:59:12 -07:00
Brian Behlendorf 54b5b41a58 Add 'feature-pthreads' branch to features branch. 2009-03-19 20:49:52 -07:00
Brian Behlendorf 7a87dfebb8 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-19 19:58:30 -07:00
Brian Behlendorf 2ddd5986e0 Merge commit 'refs/top-bases/linux-unused' into linux-unused
Conflicts:

	lib/libzpool/include/sys/zfs_context.h
2009-03-19 19:58:12 -07:00
Brian Behlendorf 6af4495583 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-19 19:57:36 -07:00
Brian Behlendorf 240445807b Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-19 19:57:13 -07:00
Brian Behlendorf d92b55464e Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-19 19:56:53 -07:00
Brian Behlendorf 0c74c762fb Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-19 19:56:42 -07:00
Brian Behlendorf 76022f22f7 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-19 19:56:19 -07:00
Brian Behlendorf dabea57f25 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-19 19:55:49 -07:00
Brian Behlendorf bc33bac9c3 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-03-19 19:55:21 -07:00
Brian Behlendorf bd2293fdb1 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-19 19:55:03 -07:00
Brian Behlendorf 5e5d31f105 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:

	lib/libzpool/include/sys/zfs_context.h
2009-03-19 19:52:21 -07:00
Brian Behlendorf 8c43ad3853 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-19 19:49:56 -07:00
Brian Behlendorf 8cdcf1ef44 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-03-19 19:49:55 -07:00
Brian Behlendorf 05cec154f5 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2009-03-19 19:49:53 -07:00
Brian Behlendorf 53db4c7b29 Revert fix-pthreads moving to feature-pthreads branch 2009-03-19 19:43:09 -07:00
Brian Behlendorf 6ca96b06b4 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-03-18 13:03:00 -07:00
Brian Behlendorf cc4fbf2c35 Revert to previous behavior zdb fails when unable to open /dev/zfs.
For the moment I have added an error message to the failure path to
make it clear what happened.  I have also changed the zdb ASSERT to
a VERIFY so we always catch the failure.  For now we will just always
ensure the module stack is loaded, longer term we need something a
little more flexible.
2009-03-18 12:48:54 -07:00
Brian Behlendorf 9ce6adee54 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-17 16:07:04 -07:00
Brian Behlendorf 085d04563d Add stub header which is missing in new versions of glibc 2009-03-17 15:53:34 -07:00
Brian Behlendorf da843563aa Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-16 16:23:03 -07:00
Brian Behlendorf 357d6a92b5 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-03-16 16:22:48 -07:00
Brian Behlendorf 57defb44e4 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-16 16:22:34 -07:00
Brian Behlendorf 1997a1de19 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-16 16:22:04 -07:00
Brian Behlendorf 2c5de77eae Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-16 16:21:33 -07:00
Brian Behlendorf b7f6b6e19d Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-16 16:21:15 -07:00
Brian Behlendorf c72f5112d3 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-16 16:20:45 -07:00
Brian Behlendorf 5edabb999f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-16 16:20:02 -07:00
Brian Behlendorf 990500b8a2 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-03-16 16:19:21 -07:00
Brian Behlendorf 85f5512989 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-16 16:19:03 -07:00
Brian Behlendorf f28a31a09a Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-16 16:18:01 -07:00
Brian Behlendorf df985d53db Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-16 16:17:57 -07:00
Brian Behlendorf f86b52a39d Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-16 16:17:55 -07:00
Brian Behlendorf 3eebe1bd0e Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-03-16 16:17:54 -07:00
Brian Behlendorf 3eb4ba3ebd Add 3 more uninit errors detected by gcc 3.4.0 compiler. 2009-03-16 16:06:50 -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 389c6947b4 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-03-16 10:43:07 -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 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 7b9c5225a1 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-16 10:41:17 -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 9d19cb6390 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-16 10:40:36 -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 762ea3d453 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-03-16 10:39:21 -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 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 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 9818e69640 Merge branch 'fix-deadcode' into refs/top-bases/fix-branch 2009-03-16 10:12:01 -07:00
Brian Behlendorf 2924858552 Remove two self referential functions.
Newer versions of gcc (4.3.0) detected the following unused
code segments.
2009-03-16 10:02:06 -07:00
Brian Behlendorf adaf659f27 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-13 09:51:37 -07:00
Brian Behlendorf caba3cb67e Update specific asm-* arch to generic i386.
Depending on your x86 architecture $target_cpu can evaluate to
any of the following (i386|i486|i586|i686).  Since our local asm
uses only i386 instructions sed is used to map all of these to
i386 and sets $target_arch.  Other arch's are not impacted.
2009-03-13 09:41:55 -07:00
Brian Behlendorf 59edc6fb4e Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-12 15:47:27 -07:00
Brian Behlendorf b998074378 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-03-12 15:47:18 -07:00
Brian Behlendorf 640eb1d542 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-12 15:47:07 -07:00
Brian Behlendorf c399ce1af8 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-12 15:46:45 -07:00
Brian Behlendorf efb120466a Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-12 15:46:27 -07:00
Brian Behlendorf 8c6d5f619a Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-12 15:46:18 -07:00
Brian Behlendorf e892c29158 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-12 15:45:56 -07:00
Brian Behlendorf c6c2cf2b51 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-12 15:45:29 -07:00
Brian Behlendorf edb8e53164 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-03-12 15:45:06 -07:00
Brian Behlendorf 9e4850e3d1 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-12 15:44:54 -07:00
Brian Behlendorf 5a7e7e9d3b Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-12 15:44:18 -07:00
Brian Behlendorf 82ce8b00f3 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-12 15:44:14 -07:00
Brian Behlendorf 6a5acaa105 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-12 15:44:13 -07:00
Brian Behlendorf 9fe5b916e2 Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch 2009-03-12 15:39:27 -07:00
Brian Behlendorf 9e49df6b20 Add gcc-fortify-source branch 2009-03-12 15:38:51 -07:00
Brian Behlendorf 85abe1f810 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-12 15:29:20 -07:00
Brian Behlendorf 679504bc4e Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-03-12 15:29:09 -07:00
Brian Behlendorf 574ed0e0b7 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-12 15:29:01 -07:00
Brian Behlendorf a5326d0d28 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-12 15:28:42 -07:00
Brian Behlendorf ba2402f375 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-12 15:28:22 -07:00
Brian Behlendorf a26176bf63 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-12 15:28:13 -07:00
Brian Behlendorf 13e1e9584c Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-12 15:27:51 -07:00
Brian Behlendorf cc0c97146c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-12 15:27:28 -07:00
Brian Behlendorf b9a30741d1 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-03-12 15:27:03 -07:00
Brian Behlendorf d830f4bf24 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-12 15:26:54 -07:00
Brian Behlendorf d66ce12199 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-12 15:26:18 -07:00
Brian Behlendorf 379d9cf34d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-12 15:26:15 -07:00
Brian Behlendorf 6a59551cb7 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-03-12 15:26:13 -07:00
Brian Behlendorf c4e10eb3df Merge branch 'fix-strncat' into refs/top-bases/fix-branch 2009-03-12 15:21:30 -07:00
Brian Behlendorf f1f9c50dd9 Add fix-strncat branch which corrects a buffer overrun. 2009-03-12 15:20:26 -07:00
Brian Behlendorf a47a8f2932 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-12 15:15:25 -07:00
Brian Behlendorf 39e4615e42 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-03-12 15:15:16 -07:00
Brian Behlendorf 4e4fbfe52c Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-12 15:15:10 -07:00
Brian Behlendorf 0a6d02c2b9 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-12 15:15:08 -07:00
Brian Behlendorf cd52c92666 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-12 15:14:46 -07:00
Brian Behlendorf b0d71d0ee7 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-12 15:14:29 -07:00
Brian Behlendorf de666d0506 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-12 15:14:21 -07:00
Brian Behlendorf 2b38abcd29 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-12 15:14:01 -07:00
Brian Behlendorf 224d1bc012 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-12 15:13:35 -07:00
Brian Behlendorf 9f9dc1dedf Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-03-12 15:13:10 -07:00
Brian Behlendorf 74a134347a Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-12 15:13:02 -07:00
Brian Behlendorf 35b117277d Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-12 15:12:26 -07:00
Brian Behlendorf f2e7d57653 Packaging update
Make LINUX_VERSION available to Makefile's, add packaging
for user space include headers.
2009-03-12 15:07:29 -07:00
Brian Behlendorf 59541a305e Libspl XDR implementation reorganization
Moved xdr_control() function from static inline in xdr.h in to a
new xdr.c file which was added to the libspl build.  Additionally,
I have removed the 'xdr_bytesrec' typedef which shares the same
name as the struct.  This is what Solaris does, but it's just asking
for trouble.  It has been replaced with an 'xdr_bytesrec_t' typedef.
2009-03-12 14:38:52 -07:00
Brian Behlendorf bb06faa046 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-12 10:40:54 -07:00
Brian Behlendorf 7d80d0a328 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-03-12 10:40:40 -07:00
Brian Behlendorf 3d35752b2b Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-12 10:40:32 -07:00
Brian Behlendorf fbbb5fe669 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-12 10:40:09 -07:00
Brian Behlendorf 8bd00f4aa5 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-12 10:39:42 -07:00
Brian Behlendorf 7f8c9b233a Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-12 10:39:34 -07:00
Brian Behlendorf e0b048a823 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-12 10:39:17 -07:00
Brian Behlendorf 2ff032fd60 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-12 10:38:44 -07:00
Brian Behlendorf b99d17d846 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-03-12 10:38:14 -07:00
Brian Behlendorf 45f3d2a2a4 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-12 10:38:05 -07:00
Brian Behlendorf 9bdbd7c8f7 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-12 10:37:18 -07:00
Brian Behlendorf b9b399bf04 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-12 10:37:14 -07:00
Brian Behlendorf a03187bb3b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-12 10:37:12 -07:00
Brian Behlendorf f8fe8a76f4 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-03-12 10:37:11 -07:00
Brian Behlendorf cabd4a69c4 Resolve remaining uninitialized variables
Most of these fixes appear to be harmless and should never occur.
However, there were a few cases in this patch which do concern me,
I doubt we're seeing them but they look possible... mainly in the
user tools.
2009-03-12 10:30:41 -07:00
Brian Behlendorf a59f378c54 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-12 10:03:31 -07:00
Brian Behlendorf 5dac6cac77 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-03-12 10:03:22 -07:00
Brian Behlendorf df8e13b5bd Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-12 10:03:02 -07:00
Brian Behlendorf 77695eacc1 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-12 10:02:45 -07:00
Brian Behlendorf 8282eab4f8 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-12 10:02:22 -07:00
Brian Behlendorf 8feb346bcd Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-12 10:02:13 -07:00
Brian Behlendorf 2a002fd082 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-12 10:01:56 -07:00
Brian Behlendorf 165b2611d2 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-12 10:01:25 -07:00
Brian Behlendorf e7941cdcac Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-03-12 10:00:57 -07:00
Brian Behlendorf dcc25c44da Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-12 10:00:48 -07:00
Brian Behlendorf 0cdc14e427 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-12 10:00:07 -07:00
Brian Behlendorf dd30dba016 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-12 10:00:04 -07:00
Brian Behlendorf 193ea156e9 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-12 10:00:03 -07:00
Brian Behlendorf eceaf813ad Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2009-03-12 10:00:01 -07:00
Brian Behlendorf f2d72af596 Add remaining missing cases (or a default) to all switch statements.
The previous code was not wrong, but this prevents gcc from warning
us about missing cases for these known safe switch statements.  The
-Wno-missing-cases can now be removed to detect places where we
accidentally forgot a case.
2009-03-12 09:53:08 -07:00
Brian Behlendorf 53b7082303 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-03-11 22:28:01 -07:00
Brian Behlendorf 426ed71564 Pull unused function under HAVE_LIBEFI ifdef. 2009-03-11 22:17:38 -07:00
Brian Behlendorf cb52b25a43 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-11 21:03:09 -07:00
Brian Behlendorf 57063ee09e Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-03-11 21:02:59 -07:00
Brian Behlendorf da324afb34 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-11 21:02:49 -07:00
Brian Behlendorf b392fd33fd Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-11 21:02:27 -07:00
Brian Behlendorf fd3f8fec08 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-11 21:02:07 -07:00
Brian Behlendorf 72ae0af5c9 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-11 21:01:55 -07:00
Brian Behlendorf 8d06511a29 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-11 21:01:35 -07:00
Brian Behlendorf b6616bd2c6 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-11 21:01:03 -07:00
Brian Behlendorf fb4af5ddea Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-03-11 21:00:35 -07:00
Brian Behlendorf 9c4cc2ae78 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-11 21:00:25 -07:00
Brian Behlendorf c351352990 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-11 20:59:46 -07:00
Brian Behlendorf 4c042de40b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 20:59:43 -07:00
Brian Behlendorf 60ac8152fe Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 20:59:42 -07:00
Brian Behlendorf 9915249546 Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2009-03-11 20:53:11 -07:00
Brian Behlendorf d4dbc7dca8 Resolve all instances of missing braces. 2009-03-11 20:52:21 -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 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 b2041bc8ef Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-11 14:13:33 -07:00
Brian Behlendorf b5b25a748d Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-03-11 14:13:20 -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 2d06af318e Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-03-11 14:10:02 -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 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 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 68b242507a Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-03-11 11:20:44 -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 013ff8660b Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-03-11 11:16:14 -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 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 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 66a5ec0f7b Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-10 21:30:48 -07:00
Brian Behlendorf 9eba109484 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-03-10 21:30:35 -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 d20eebca7e Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-03-10 21:26:26 -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 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 bc2357f461 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-02-18 15:23:45 -08:00
Brian Behlendorf 642a597d3a Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-02-18 15:23:36 -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 4ab00f983f Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-02-18 15:21:07 -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 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 bf75e042f9 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-02-18 14:37:31 -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 76c1dd44ab Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-02-18 14:34:14 -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 7fe1b71533 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2009-02-18 14:29:19 -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 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 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 adcb983918 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-15 14:22:14 -08:00
Brian Behlendorf ca8bcb2496 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-15 14:22:07 -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 d0215bbc68 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-01-15 14:19:12 -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 1d3ce40c2e Merge commit 'refs/top-bases/fix-stack' into fix-stack 2009-01-15 14:16:09 -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 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 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 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 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 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 402405558a Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-09 15:11:56 -08:00
Brian Behlendorf 3a9ed52a6c Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-09 15:11:52 -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 3396d6d69e Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-01-09 15:10:47 -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 a7e5f34acb Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-09 14:46:41 -08:00
Brian Behlendorf ae80ba7fda Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-09 14:46:36 -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 00878a5eeb Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-01-09 14:45:34 -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 8a6f0ab272 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-08 10:29:23 -08:00
Brian Behlendorf b7ba234fcc Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-08 10:29:18 -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 456bfebb79 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-01-08 10:28:05 -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 77c4ef21ab Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-05 13:47:29 -08:00
Brian Behlendorf b22496960e Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-05 13:47:24 -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 4c770d136e Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-01-05 13:46:25 -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 35cfc1bb85 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-05 12:45:38 -08:00
Brian Behlendorf 13e4ebb0b3 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-05 12:45:29 -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 0d1e4f9d15 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-01-05 12:40:05 -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 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 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 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 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 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 97e7199aaf Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2008-12-22 14:45:43 -08:00
Brian Behlendorf 01dd722b45 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-22 14:45:38 -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 77ff1773c4 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-22 14:44:30 -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 139792e6b2 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2008-12-22 13:53:03 -08:00
Brian Behlendorf 617556ddde Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-22 13:52:57 -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 1c2cf3a788 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-22 13:51:45 -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 0789abcd67 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2008-12-22 12:55:06 -08:00
Brian Behlendorf 46ee012365 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-22 12:55:01 -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 30f88fa721 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-22 12:53:51 -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 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 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 0cf01a7c69 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-22 11:42:28 -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 85797a38b0 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-22 11:41:15 -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 735f99cbcb Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-22 10:37:47 -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 e8bf0a8581 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-22 10:36:36 -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 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 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 9ce20e962a Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-19 16:57:50 -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 960e9d0fc4 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-19 16:55:42 -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 a89736c72e Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-19 16:36:09 -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 bf5dcc9261 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-19 16:33:47 -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 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 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 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 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 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 1f2ec6b6cd Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-19 13:38:51 -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 91e1f08ddf Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-19 13:37:44 -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 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 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 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 3c787f200f Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-19 12:11:19 -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 51aa44f39c Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-19 12:09:04 -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 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 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 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 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 347283843e Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-19 10:19:58 -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