Commit Graph

915 Commits

Author SHA1 Message Date
Brian Behlendorf fe7a703285 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-15 14:38:39 -08:00
Brian Behlendorf 3b6c91ec9f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 14:38:38 -08:00
Brian Behlendorf ec41b57eb3 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-15 14:38:38 -08:00
Brian Behlendorf e9c7a643f1 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-15 14:38:37 -08:00
Brian Behlendorf 77f365172c Resolve C90 int declared in for() construct 2009-01-15 14:36:27 -08:00
Brian Behlendorf 7dd685ccc3 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-15 14:30:14 -08:00
Brian Behlendorf b83cf899ca Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-15 14:29:13 -08:00
Brian Behlendorf 062f1f78c6 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-15 14:29:11 -08:00
Brian Behlendorf cb55f9a832 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 14:29:11 -08:00
Brian Behlendorf 43b4c537eb Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-15 14:29:10 -08:00
Brian Behlendorf f969333c73 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-15 14:29:09 -08:00
Brian Behlendorf c4fc002c87 Resolve C90 int declared in for() construct 2009-01-15 14:26:52 -08:00
Brian Behlendorf 465b2c795d Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-15 14:21:24 -08:00
Brian Behlendorf 1f372d9030 Resolve conflict with removed cleaner type 2009-01-15 14:18:01 -08:00
Brian Behlendorf 8684f3ea64 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-15 14:16:25 -08:00
Brian Behlendorf ddaad20220 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 14:16:23 -08:00
Brian Behlendorf 089836c3e4 Resolve conflict with removed cleaner type 2009-01-15 14:14:57 -08:00
Brian Behlendorf 551838a6c8 Resolve conflict with removed cleaner type 2009-01-15 14:13:39 -08:00
Brian Behlendorf b633e4f669 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2009-01-15 14:11:26 -08:00
Brian Behlendorf da7151a89e Resolve conflict with removed cleaner type 2009-01-15 14:11:19 -08:00
Brian Behlendorf 977fef2ba7 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2009-01-15 14:05:32 -08:00
Brian Behlendorf a2e601c6e3 Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2009-01-15 14:04:39 -08:00
Brian Behlendorf 3fa768e21b Resolve conflict with removed cleaner type 2009-01-15 14:04:35 -08:00
Brian Behlendorf d3df6b2012 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2009-01-15 14:01:51 -08:00
Brian Behlendorf fb5f0bc833 Rebase master to b105 2009-01-15 13:59:39 -08:00
Brian Behlendorf 904640e3c7 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-14 13:32:33 -08:00
Brian Behlendorf fb941c67fa Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-14 13:32:31 -08:00
Brian Behlendorf c0edd1f948 Remove unneeded header 2009-01-14 13:30:32 -08:00
Brian Behlendorf 50832652c2 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-14 08:42:33 -08:00
Brian Behlendorf ad1dde3678 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-14 08:42:11 -08:00
Brian Behlendorf b8ca971861 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-14 08:42:00 -08:00
Brian Behlendorf 1194e0412f Change all instances of kpios to zpios 2009-01-14 08:38:35 -08:00
Brian Behlendorf f63f4dd2cd Remove unneeded chunk, create a FS the real way with an ioctl 2009-01-14 08:26:09 -08:00
Brian Behlendorf 4497cfb321 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-13 16:49:26 -08:00
Brian Behlendorf 9ab30b2e96 Use zpios not kpios for referce 2009-01-13 16:42:21 -08:00
Brian Behlendorf 7635d14cd1 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-13 16:09:27 -08:00
Brian Behlendorf 2dac6d5542 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-13 16:08:32 -08:00
Brian Behlendorf 7783aee79c Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-13 16:07:47 -08:00
Brian Behlendorf fce0143a40 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-13 16:07:45 -08:00
Brian Behlendorf 083b3d000c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-13 16:06:37 -08:00
Brian Behlendorf 622ce10cde Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-13 16:06:30 -08:00
Brian Behlendorf 04d7ae5f22 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-13 16:06:28 -08:00
Brian Behlendorf c186f81c6d Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-13 16:06:26 -08:00
Brian Behlendorf e1632568f1 Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 16:06:23 -08:00
Brian Behlendorf be0b4029db Initialize list links 2009-01-13 16:02:19 -08:00
Brian Behlendorf 5ae7f2d447 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-13 15:35:25 -08:00
Brian Behlendorf 95db697cc4 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-13 15:35:01 -08:00
Brian Behlendorf 43ac9f83e1 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-13 15:34:39 -08:00
Brian Behlendorf c3335290e2 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-13 15:34:38 -08:00
Brian Behlendorf 38f7defc95 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-13 15:34:04 -08:00
Brian Behlendorf 93b6e66d9b Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-13 15:34:01 -08:00
Brian Behlendorf 32baeb1712 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-13 15:34:01 -08:00
Brian Behlendorf 0d6b81fcca Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-13 15:34:00 -08:00
Brian Behlendorf 43cd437415 Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 15:33:59 -08:00
Brian Behlendorf 94944fab96 Fix proper list node initialization 2009-01-13 15:31:58 -08:00
Brian Behlendorf 5ddcc115b3 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-13 15:08:32 -08:00
Brian Behlendorf de43f9a57c Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-13 15:08:08 -08:00
Brian Behlendorf 62d5f771e5 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-13 15:07:45 -08:00
Brian Behlendorf 925ed2c7a0 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-13 15:07:44 -08:00
Brian Behlendorf a93d76eb1b Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-13 15:07:11 -08:00
Brian Behlendorf d2eae65894 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-13 15:07:09 -08:00
Brian Behlendorf b14513e826 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-13 15:07:08 -08:00
Brian Behlendorf 4c31283afc Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-13 15:07:07 -08:00
Brian Behlendorf 2e9cd667d0 Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2009-01-13 15:07:06 -08:00
Brian Behlendorf fcd2296399 Additional rw_lock not being initialized cleaned in updated code 2009-01-13 15:05:02 -08:00
Brian Behlendorf ff35f88f33 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-13 15:03:36 -08:00
Brian Behlendorf e095be1cc5 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-13 15:03:12 -08:00
Brian Behlendorf fd1da7d6b9 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-13 15:02:50 -08:00
Brian Behlendorf 042deede25 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-13 15:02:49 -08:00
Brian Behlendorf 149c57fd06 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-13 15:02:15 -08:00
Brian Behlendorf acd48f80d9 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-13 15:02:13 -08:00
Brian Behlendorf 60f5ac8ac7 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-13 15:02:12 -08:00
Brian Behlendorf 4a5bd7a3a8 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-13 15:02:11 -08:00
Brian Behlendorf 6c96fc31e9 Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 15:02:10 -08:00
Brian Behlendorf bec036636e List cleanup and use of list_node_init initializer 2009-01-13 15:00:12 -08:00
Brian Behlendorf 6bc9ddf743 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-13 14:19:36 -08:00
Brian Behlendorf 4ef8421b03 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-13 14:19:13 -08:00
Brian Behlendorf 6ec00152b1 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-13 14:18:51 -08:00
Brian Behlendorf b289f6dd98 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-13 14:18:50 -08:00
Brian Behlendorf b052188ff6 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-13 14:18:16 -08:00
Brian Behlendorf 3b3a155dc4 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-13 14:18:12 -08:00
Brian Behlendorf bdb0ce1a0d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-13 14:18:11 -08:00
Brian Behlendorf 552c9e1abb Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-13 14:18:10 -08:00
Brian Behlendorf c6f1eca44b Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 14:18:09 -08:00
Brian Behlendorf 2ea04834bf Remove assertion for now 2009-01-13 14:16:11 -08:00
Brian Behlendorf 9fc1da9334 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-13 13:33:54 -08:00
Brian Behlendorf 323f4f67dd Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-13 13:33:31 -08:00
Brian Behlendorf 43b31e2884 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-13 13:33:10 -08:00
Brian Behlendorf 935c8157f9 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-13 13:33:09 -08:00
Brian Behlendorf bad8fae24d Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-13 13:32:36 -08:00
Brian Behlendorf 6eb210ddfe Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-13 13:32:32 -08:00
Brian Behlendorf f8b66dcc4f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-13 13:32:31 -08:00
Brian Behlendorf 8ad629750e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-13 13:32:30 -08:00
Brian Behlendorf bb9b10a830 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-13 13:32:29 -08:00
Brian Behlendorf b73b29ab8e Fix c90 issue with { } 2009-01-13 13:30:35 -08:00
Brian Behlendorf a0f86c6571 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-13 12:32:07 -08:00
Brian Behlendorf 6c2e910597 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-13 12:32:03 -08:00
Brian Behlendorf 5a36a4b40b Pull in needed hunk from old patch stack for a ZFS build without the ZPL support 2009-01-13 12:28:26 -08:00
Brian Behlendorf f15ef90618 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-13 11:18:11 -08:00
Brian Behlendorf 7356c2045e Update zpios.sh script to reference zfs not zpool, additionally remove unneed module load console message 2009-01-13 11:16:12 -08:00