Commit Graph

14678 Commits

Author SHA1 Message Date
Brian Behlendorf c95cb35d55 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-07-31 14:06:38 -07:00
Brian Behlendorf cb4769bbc2 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-07-31 14:06:30 -07:00
Brian Behlendorf 9dec42d15d Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-31 14:06:28 -07:00
Brian Behlendorf a9d0af9e0c Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-07-31 14:06:18 -07:00
Brian Behlendorf 5dabe4705a Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-07-31 14:06:16 -07:00
Brian Behlendorf 90668b2106 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-31 14:06:07 -07:00
Brian Behlendorf 0c20001d27 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-31 14:06:05 -07:00
Brian Behlendorf bd5a407a14 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-07-31 14:05:55 -07:00
Brian Behlendorf ebf4411b3f Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-31 14:05:54 -07:00
Brian Behlendorf a7c7eeb5bc Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-07-31 14:05:44 -07:00
Brian Behlendorf 21dee98331 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-31 14:05:42 -07:00
Brian Behlendorf aac3c197ba Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-07-31 14:05:32 -07:00
Brian Behlendorf db22ca3948 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-07-31 14:05:30 -07:00
Brian Behlendorf 7ac5a75ad4 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-07-31 14:05:21 -07:00
Brian Behlendorf 2c5abffc5f Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-07-31 14:05:19 -07:00
Brian Behlendorf a392b43a41 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-07-31 14:05:11 -07:00
Brian Behlendorf fbbffb3a8e Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-07-31 14:05:08 -07:00
Brian Behlendorf ff8a03c7ff Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-07-31 14:04:59 -07:00
Brian Behlendorf 934ac68348 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-31 14:04:57 -07:00
Brian Behlendorf 7fb28086f8 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-07-31 14:04:48 -07:00
Brian Behlendorf e03d56f19c Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-31 14:04:46 -07:00
Brian Behlendorf 6177753bdb Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-07-31 14:04:37 -07:00
Brian Behlendorf c7271f9a3a Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-31 14:04:35 -07:00
Brian Behlendorf 5b43d8c4ea Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-31 14:04:34 -07:00
Brian Behlendorf 869eb4fdcb Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-07-31 14:04:17 -07:00
Brian Behlendorf 7e865a3fb0 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-31 14:04:16 -07:00
Brian Behlendorf 8539aeef21 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-31 14:04:15 -07:00
Brian Behlendorf 5b712d76e8 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-07-31 14:03:58 -07:00
Brian Behlendorf 4161a0aa6b Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-07-31 14:03:56 -07:00
Brian Behlendorf 7aa7217e6b Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-07-31 14:03:46 -07:00
Brian Behlendorf 3f4eb7aad6 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-07-31 14:03:44 -07:00
Brian Behlendorf e69a3cc891 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-07-31 14:03:34 -07:00
Brian Behlendorf 744f29654f Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-31 14:03:32 -07:00
Brian Behlendorf 93d07dd3d2 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-07-31 14:03:22 -07:00
Brian Behlendorf 763ea6c56a Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-07-31 14:03:20 -07:00
Brian Behlendorf 53540624b9 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-07-31 14:03:09 -07:00
Brian Behlendorf daec35a52e Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-07-31 14:03:06 -07:00
Brian Behlendorf 4880532956 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-07-31 14:02:54 -07:00
Brian Behlendorf 34ed0b4870 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-07-31 14:02:50 -07:00
Brian Behlendorf 9f5e45ef4d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-31 14:02:49 -07:00
Brian Behlendorf cf44f97b96 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-31 14:02:48 -07:00
Brian Behlendorf af8e850408 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-07-31 14:02:47 -07:00
Brian Behlendorf 252846a145 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2009-07-31 14:02:46 -07:00
Brian Behlendorf cfd9e9936f Fix an accidentally introduced formatting issue in zfs output.
Because the local 'index' variable shadows the index() function
it was replaced by 'i'.  Unfortunately when I made this change
I accidentally replaced one instance with 'j' resulting in the
short decimal values being printed incorrectly.
2009-07-31 13:50:21 -07:00
Brian Behlendorf 14b56711dd Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-30 10:08:10 -07:00
Brian Behlendorf e6e403381d Revert remaining unneeded change so the topic branch can be removed. 2009-07-30 09:59:31 -07:00
Brian Behlendorf e2dec6ad53 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-07-29 21:31:54 -07:00
Brian Behlendorf 9c465ccee3 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-07-29 21:31:52 -07:00
Brian Behlendorf 6044bdbdd9 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-07-29 21:31:42 -07:00
Brian Behlendorf c39c235053 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-07-29 21:31:38 -07:00