Commit Graph

624 Commits

Author SHA1 Message Date
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 0f742dfc96 Refresh context 2009-01-05 12:45:17 -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 9c2bf69ecb Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 12:40:25 -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 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 ef6c136edb Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 14:45:33 -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 16d3bec487 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 14:44:42 -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 fa078fa9dd Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 13:52:53 -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 1f72057409 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 13:51:57 -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 57e03b4986 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 12:54:57 -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 34f30113a8 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 12:54:03 -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 d7fafdb56e Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 11:42:23 -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 187be3051e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 11:41:27 -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 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 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 bdbd91fe46 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 10:36:48 -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 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 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 2e8b703fff Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 16:56:03 -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 252ef2053c Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-19 16:36:02 -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 cbc70456f1 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 16:34:10 -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 d6013ca22b Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-19 13:38:47 -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 4679c1631c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 13:37:55 -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 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 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