Commit Graph

1872 Commits

Author SHA1 Message Date
Brian Behlendorf ccd4d3d454 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-10 15:52:00 -08:00
Brian Behlendorf 056c622f86 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-10 15:51:58 -08:00
Brian Behlendorf 695f8589f4 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-10 15:51:57 -08:00
Brian Behlendorf df91e02549 Move some headers 2008-12-10 15:50:04 -08:00
Brian Behlendorf f9407b22b6 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-10 15:47:24 -08:00
Brian Behlendorf 89f036922b Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-10 15:47:23 -08:00
Brian Behlendorf 16bf84ee9b Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-10 15:47:21 -08:00
Brian Behlendorf 17a7e08b50 Move out of static inline to real function 2008-12-10 15:45:25 -08:00
Brian Behlendorf 05cc4da71e Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-10 14:44:03 -08:00
Brian Behlendorf 2c1c862c1a Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-10 14:44:02 -08:00
Brian Behlendorf 2948fe19f6 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-10 14:44:01 -08:00
Brian Behlendorf 2a7a475196 Add getexecname to Makefiles 2008-12-10 14:42:09 -08:00
Brian Behlendorf 85066e4acf Remove unneeded includes 2008-12-10 14:39:52 -08:00
Brian Behlendorf 2131a3ca43 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-10 14:14:18 -08:00
Brian Behlendorf 7f7087d8bd Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-10 14:14:17 -08:00
Brian Behlendorf a26dfeacbb Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-10 14:14:16 -08:00
Brian Behlendorf 21056826ec Add missing assert.h 2008-12-10 14:12:26 -08:00
Brian Behlendorf ba835da531 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-10 14:02:06 -08:00
Brian Behlendorf ef5a5b4687 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-10 14:02:05 -08:00
Brian Behlendorf 8d3fc10b21 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-10 14:02:03 -08:00
Brian Behlendorf 7fdedffcfd Add 3 missing headers 2008-12-10 13:59:59 -08:00
Brian Behlendorf 5b2020d684 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-10 13:32:54 -08:00
Brian Behlendorf cdbdeafc56 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-12-10 13:32:52 -08:00
Brian Behlendorf 349fa9891f Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-10 13:32:51 -08:00
Brian Behlendorf aa52f01a88 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-10 13:32:50 -08:00
Brian Behlendorf 4de6172e16 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-10 13:32:46 -08:00
Brian Behlendorf 1e76884533 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-10 13:32:45 -08:00
Brian Behlendorf ec85d8aeac Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-10 13:32:42 -08:00
Brian Behlendorf d6e05caf13 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-10 13:32:40 -08:00
Brian Behlendorf 8b6083604f Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-10 13:32:37 -08:00
Brian Behlendorf 90b73736b6 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-10 13:32:35 -08:00
Brian Behlendorf 7be463025e Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-10 13:32:32 -08:00
Brian Behlendorf 3b59a00df0 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-10 13:32:31 -08:00
Brian Behlendorf 51641ea723 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-10 13:32:27 -08:00
Brian Behlendorf 23bc3f6ed7 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-10 13:32:26 -08:00
Brian Behlendorf 3cf04bc939 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-10 13:32:22 -08:00
Brian Behlendorf 5bcc6840ba Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-10 13:32:21 -08:00
Brian Behlendorf c07fbfcc71 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-10 13:32:17 -08:00
Brian Behlendorf 244b7f3c71 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-10 13:32:16 -08:00
Brian Behlendorf 05399b6f6d Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-10 13:32:12 -08:00
Brian Behlendorf b04adc9d17 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-10 13:32:10 -08:00
Brian Behlendorf 390d4a8f93 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-10 13:32:07 -08:00
Brian Behlendorf e03a6b8fa1 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-10 13:32:06 -08:00
Brian Behlendorf d08affc5b5 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-10 13:32:02 -08:00
Brian Behlendorf 61e6f29ba7 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-10 13:32:01 -08:00
Brian Behlendorf b0026c1d0f Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-10 13:32:00 -08:00
Brian Behlendorf 41bff0b007 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-10 13:31:54 -08:00
Brian Behlendorf 8bdc2cccf3 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-10 13:31:53 -08:00
Brian Behlendorf 7a29405676 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-10 13:31:52 -08:00
Brian Behlendorf aa05fe67f0 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-10 13:31:46 -08:00