Commit Graph

3149 Commits

Author SHA1 Message Date
Brian Behlendorf 57e0171065 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-12-11 12:07:58 -08:00
Brian Behlendorf 8bc41ddf2e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-12-11 12:07:58 -08:00
Brian Behlendorf acd798cfd4 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-12-11 12:07:23 -08:00
Brian Behlendorf f8d093f69b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-12-11 12:07:23 -08:00
Brian Behlendorf 0cc4cdb30d Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-12-11 12:07:22 -08:00
Brian Behlendorf b76d12a644 Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch 2009-12-11 12:07:22 -08:00
Brian Behlendorf ba7ccf8ccd Cast to unsigned long long for 32-bit arches 2009-12-11 11:41:04 -08:00
Brian Behlendorf 2161ccab6c Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-11-24 15:51:41 -08:00
Brian Behlendorf 1cb221aa8c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-11-24 15:51:41 -08:00
Brian Behlendorf 0ec3a0ef62 Add udev rules to zfs-test package 2009-11-24 15:48:16 -08:00
Brian Behlendorf c406e97fbc Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-11-24 14:59:25 -08:00
Brian Behlendorf 439d66a111 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-11-24 14:59:24 -08:00
Brian Behlendorf 07a35df315 The libuuid and libblkid have been split from e2fsprogs in fc12,
el6, and ch5 systems.  Additionally, correct ZFS filesystem detection
has not yet been added to these packages so for now disable blkid.
2009-11-24 14:54:33 -08:00
Brian Behlendorf 825cbfba67 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-11-24 14:18:04 -08:00
Brian Behlendorf a9696abc16 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-11-24 14:18:04 -08:00
Brian Behlendorf c8bd25ac98 Add 'srpm' --with-config option for creation of spec files. 2009-11-24 14:13:25 -08:00
Brian Behlendorf e12501a811 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-11-24 13:28:09 -08:00
Brian Behlendorf b2db10264a Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-11-24 13:28:08 -08:00
Brian Behlendorf 9441b7efc4 Add chaos5 and rhel6 macro's to the zfs-modules.spec.in 2009-11-24 13:24:25 -08:00
Brian Behlendorf 3645d79a1d Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-11-24 12:47:57 -08:00
Brian Behlendorf 27bda60b11 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-11-24 12:47:56 -08:00
Brian Behlendorf eb6f06154b Prep for 0.4.7 tag, updated META and ChangeLog. 2009-11-24 12:43:40 -08:00
Brian Behlendorf 3b1a5aede4 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-11-20 16:21:20 -08:00
Brian Behlendorf b9ab6dc4cc Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-11-20 16:21:19 -08:00
Brian Behlendorf c14a8b2272 Ensure *.order and *.markers build products are removed by distclean rule. 2009-11-20 16:17:16 -08:00
Brian Behlendorf 67154a81b9 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-11-20 10:58:51 -08:00
Brian Behlendorf bc20ccb15c Revert just zfs_ioctl.c changes moved to linux-kernel-disk branch. 2009-11-20 10:55:19 -08:00
Brian Behlendorf d40808c351 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-11-20 10:30:28 -08:00
Brian Behlendorf 07cdadc1f8 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-11-20 10:30:27 -08:00
Brian Behlendorf cac1bc41dc Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-11-20 10:29:49 -08:00
Brian Behlendorf 77c347db31 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-11-20 10:29:48 -08:00
Brian Behlendorf 9c8765a219 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-11-20 10:29:48 -08:00
Brian Behlendorf 0f315a58bb Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-11-20 10:29:47 -08:00
Brian Behlendorf 0160d32326 Symbol spa_busy() not required in Linux port removing EXPORT_SYMBOL 2009-11-20 10:16:37 -08:00
Brian Behlendorf 23304dc828 Add 16 drive promise JBOD zpool configs for small test setup. 2009-11-20 10:12:41 -08:00
Brian Behlendorf 6fabeffd3b Additional ZVOL compatibility autoconf checks and zconfig ZVOL sanity test. 2009-11-20 10:04:56 -08:00
Brian Behlendorf 3191b962f6 Prevent gcc uninit compiler warning in zfs_range_unlock_reader(). 2009-11-20 09:59:58 -08:00
Brian Behlendorf 5a08683d98 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-11-16 10:36:52 -08:00
Brian Behlendorf 8f7bb4a24b Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-11-16 10:36:52 -08:00
Brian Behlendorf 915205a6e8 Add autoconf checks for zvol integration. 2009-11-16 10:31:10 -08:00
Brian Behlendorf c03a7d863c Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-11-15 16:27:44 -08:00
Brian Behlendorf b6c57fe77e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-11-15 16:27:44 -08:00
Brian Behlendorf 844280cb2c Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-11-15 16:27:02 -08:00
Brian Behlendorf d00a0ea8a0 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-11-15 16:27:02 -08:00
Brian Behlendorf 368cfaefdb Merge commit 'refs/top-bases/feature-branch' into feature-branch 2009-11-15 16:27:00 -08:00
Brian Behlendorf f056747e61 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2009-11-15 16:27:00 -08:00
Brian Behlendorf 71ccaccb2b Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2009-11-15 16:27:00 -08:00
Brian Behlendorf 475e214ce1 Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2009-11-15 16:27:00 -08:00
Brian Behlendorf 8c5797df77 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2009-11-15 16:26:58 -08:00
Brian Behlendorf 65f6d4b712 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2009-11-15 16:26:58 -08:00