Commit Graph

1685 Commits

Author SHA1 Message Date
Brian Behlendorf a9e37c248d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 10:23:16 -08:00
Brian Behlendorf 342c4d05d6 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 10:23:15 -08:00
Brian Behlendorf f9e9cd6f18 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-22 10:23:14 -08:00
Brian Behlendorf 817ecade1a Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-22 10:23:14 -08:00
Brian Behlendorf 6da71c1404 Fix twop more missing voids in prototypes 2008-12-22 10:20:57 -08:00
Brian Behlendorf 034a93dacb Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-22 09:26:14 -08:00
Brian Behlendorf 978bee45d8 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 09:26:13 -08:00
Brian Behlendorf b58e34e0d8 Update makefiles 2008-12-22 09:22:39 -08:00
Brian Behlendorf ac5f33d348 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-22 09:12:28 -08:00
Brian Behlendorf e7f48402e0 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 09:12:27 -08:00
Brian Behlendorf 98810ac9fb Update zpool Makefile 2008-12-22 09:10:00 -08:00
Brian Behlendorf cb859a27ba Add librt for clock_gettime 2008-12-22 09:06:24 -08:00
Brian Behlendorf 531a4a1119 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 17:02:57 -08:00
Brian Behlendorf 7afce80eb8 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 17:02:56 -08:00
Brian Behlendorf c8ad9946dc use zlib 2008-12-19 16:58:20 -08:00
Brian Behlendorf 3a0fd3a92e Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 16:56:05 -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 60289ccd8f Add zfs_byteswap 2008-12-19 16:51:14 -08:00
Brian Behlendorf f677f67130 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 16:34:12 -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 96813619bf Pull in new background scrubber 2008-12-19 16:29:13 -08:00
Brian Behlendorf c1296ffc17 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 16:01:18 -08:00
Brian Behlendorf 081582b45a Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 16:01:18 -08:00
Brian Behlendorf fe8aa77a1b Add AM_PROG_AS to configure 2008-12-19 15:47:14 -08:00
Brian Behlendorf 36f6317537 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 13:47:54 -08:00
Brian Behlendorf 5cd3d5fe3f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 13:47:53 -08:00
Brian Behlendorf 1b2a1a31bb Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 13:47:20 -08:00
Brian Behlendorf b5e4bf3731 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 13:47:19 -08:00
Brian Behlendorf f54b79e211 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-19 13:47:18 -08:00
Brian Behlendorf 8161b781a1 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 13:47:18 -08:00
Brian Behlendorf 89bd2100e7 Resolve a few more c90 issues 2008-12-19 13:45:24 -08:00
Brian Behlendorf f8b1b642ba Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 13:37:56 -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 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 2b99cc1a0d Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 12:38:27 -08:00
Brian Behlendorf 5f5a7707b5 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 12:38:25 -08:00
Brian Behlendorf 97818e5e2b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 12:37:17 -08:00
Brian Behlendorf 459f1388ba Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 12:37:15 -08:00
Brian Behlendorf a12ef5400d Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-19 12:37:14 -08:00
Brian Behlendorf 87810a7c8b Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 12:37:13 -08:00
Brian Behlendorf 93a6c0b0b9 Fix c90 for() issue 2008-12-19 12:33:22 -08:00
Brian Behlendorf f1244c8934 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 12:09:25 -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 e485017676 Remove spa_boot from userspace build 2008-12-19 12:04:45 -08:00
Brian Behlendorf f39f71b60c Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 11:06:26 -08:00
Brian Behlendorf e5a6ed971b Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 11:06:25 -08:00
Brian Behlendorf cc92d6497b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 11:05:49 -08:00
Brian Behlendorf d67cf69e08 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 11:05:49 -08:00
Brian Behlendorf e8157d65b3 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-19 11:05:48 -08:00
Brian Behlendorf 893a49fa9a Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 11:05:48 -08:00