Commit Graph

19505 Commits

Author SHA1 Message Date
Brian Behlendorf 9ca6168420 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-05-27 17:02:58 -07:00
Brian Behlendorf e3f19ca711 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-27 17:02:56 -07:00
Brian Behlendorf 5d105e7dd7 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-05-27 17:02:47 -07:00
Brian Behlendorf 74f42d24c7 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-05-27 17:02:46 -07:00
Brian Behlendorf 3d5997879c Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-05-27 17:02:37 -07:00
Brian Behlendorf fb7a18aa41 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-27 17:02:36 -07:00
Brian Behlendorf acb2b2e3c5 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-05-27 17:02:27 -07:00
Brian Behlendorf 687ffba830 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-05-27 17:02:26 -07:00
Brian Behlendorf 35c6907c74 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-05-27 17:02:17 -07:00
Brian Behlendorf c79c9b05ab Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-05-27 17:02:15 -07:00
Brian Behlendorf 2fbe461b55 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-27 17:02:15 -07:00
Brian Behlendorf a7dcb2247a Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-05-27 17:02:14 -07:00
Brian Behlendorf 03fdccb846 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-05-27 17:02:14 -07:00
Brian Behlendorf 146ded4db2 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2010-05-27 17:02:13 -07:00
Brian Behlendorf db069704ed Revert fix-clock-wrap fixed upstream
This was more or less fixed upstream.  Instead of directly accessing
lbolt they now use ddi_get_lbolt() which we can have do the right
thing is the SPL so we don't need to carry this patch.
2010-05-27 16:54:23 -07:00
Brian Behlendorf 94d8dd395e Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch 2010-05-27 16:43:07 -07:00
Brian Behlendorf 05a2a919c8 Merge commit 'refs/top-bases/linux-user-util' into linux-user-util 2010-05-27 16:43:05 -07:00
Brian Behlendorf 15b01c2516 Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 2010-05-27 16:42:57 -07:00
Brian Behlendorf 7a3958fd05 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-27 16:42:56 -07:00
Brian Behlendorf f6b3017eb0 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-05-27 16:42:55 -07:00
Brian Behlendorf 9f45ab7bf4 Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-05-27 16:42:38 -07:00
Brian Behlendorf 496a865b5f Merge commit 'refs/top-bases/linux-events' into linux-events 2010-05-27 16:42:37 -07:00
Brian Behlendorf cf27cc10c1 Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-05-27 16:42:28 -07:00
Brian Behlendorf c9af5437de Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-05-27 16:42:27 -07:00
Brian Behlendorf 2963c6730e Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-05-27 16:42:18 -07:00
Brian Behlendorf 36d23159f8 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-05-27 16:42:17 -07:00
Brian Behlendorf 51516cac2e Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-05-27 16:42:08 -07:00
Brian Behlendorf 69cc10db26 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-05-27 16:42:07 -07:00
Brian Behlendorf e1b58759fa Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-05-27 16:41:59 -07:00
Brian Behlendorf 33797d11c5 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-05-27 16:41:57 -07:00
Brian Behlendorf 1d0fef323a Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-05-27 16:41:49 -07:00
Brian Behlendorf 89a80898c6 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-05-27 16:41:47 -07:00
Brian Behlendorf 35a3018457 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-05-27 16:41:39 -07:00
Brian Behlendorf 4a0b9c54b1 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-05-27 16:41:37 -07:00
Brian Behlendorf 3fe548d2b3 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-05-27 16:41:29 -07:00
Brian Behlendorf 8961c991b9 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-05-27 16:41:27 -07:00
Brian Behlendorf 5a19d6f994 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-05-27 16:41:19 -07:00
Brian Behlendorf 3a3b13a80c Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-27 16:41:17 -07:00
Brian Behlendorf 8e7ad5182f Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-05-27 16:41:09 -07:00
Brian Behlendorf 9af9ee6522 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-05-27 16:41:07 -07:00
Brian Behlendorf d6a8e03e79 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-05-27 16:40:59 -07:00
Brian Behlendorf 38ba4d7b71 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-27 16:40:57 -07:00
Brian Behlendorf 1961da0769 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-05-27 16:40:48 -07:00
Brian Behlendorf e4469ebf35 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-05-27 16:40:47 -07:00
Brian Behlendorf 4a74ccb147 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-05-27 16:40:38 -07:00
Brian Behlendorf 501dac9872 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-05-27 16:40:37 -07:00
Brian Behlendorf dcf4bc1e52 Re-remove feature-branch dependency. 2010-05-27 16:34:02 -07:00
Brian Behlendorf 7c707a0d4e Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch 2010-05-27 16:23:58 -07:00
Brian Behlendorf 44fdc3f023 Merge commit 'refs/top-bases/linux-user-util' into linux-user-util 2010-05-27 16:23:57 -07:00
Brian Behlendorf eac19551b7 Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 2010-05-27 16:23:48 -07:00