Commit Graph

13331 Commits

Author SHA1 Message Date
Brian Behlendorf fa6a5d9e82 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-07-08 09:19:34 -07:00
Brian Behlendorf 0242cb33fe Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-07-08 09:19:31 -07:00
Brian Behlendorf ee56fcdc7e Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-07-08 09:19:19 -07:00
Brian Behlendorf e5843486bd Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-07-08 09:19:16 -07:00
Brian Behlendorf 5f2300272e Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-07-08 09:19:06 -07:00
Brian Behlendorf 1ef0da1c7b Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-07-08 09:19:03 -07:00
Brian Behlendorf 06e75376b9 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-07-08 09:18:50 -07:00
Brian Behlendorf 6e1c4e5bd6 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-08 09:18:45 -07:00
Brian Behlendorf e37dd8d947 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-07-08 09:18:35 -07:00
Brian Behlendorf e2e3b40ef9 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-08 09:18:32 -07:00
Brian Behlendorf 6ab57ac816 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-07-08 09:18:22 -07:00
Brian Behlendorf 0d73002d8d Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-08 09:18:20 -07:00
Brian Behlendorf 1e0e588128 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-08 09:18:18 -07:00
Brian Behlendorf 57c5639642 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-07-08 09:17:56 -07:00
Brian Behlendorf 2aa22c1ccb Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-08 09:17:53 -07:00
Brian Behlendorf 1355255010 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-08 09:17:52 -07:00
Brian Behlendorf 169529da97 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-07-08 09:17:31 -07:00
Brian Behlendorf 9d873b8884 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-07-08 09:17:28 -07:00
Brian Behlendorf 85a3615ac4 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-07-08 09:17:17 -07:00
Brian Behlendorf d15c4da380 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-07-08 09:17:13 -07:00
Brian Behlendorf f1dcbefd86 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-07-08 09:17:03 -07:00
Brian Behlendorf cca71cc88b Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-08 09:17:00 -07:00
Brian Behlendorf abacab9b7f Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-07-08 09:16:49 -07:00
Brian Behlendorf 1182c9a9d1 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-07-08 09:16:47 -07:00
Brian Behlendorf 1704895994 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-07-08 09:16:36 -07:00
Brian Behlendorf 368436bb83 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-07-08 09:16:33 -07:00
Brian Behlendorf d7b6c7b71d Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-07-08 09:16:23 -07:00
Brian Behlendorf 4fdbf16476 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-07-08 09:16:20 -07:00
Brian Behlendorf affa4ec536 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-08 09:16:10 -07:00
Brian Behlendorf aa636ae442 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-08 09:16:07 -07:00
Brian Behlendorf 33077ad631 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-08 09:16:05 -07:00
Brian Behlendorf f00e6fe5c3 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-08 09:16:04 -07:00
Brian Behlendorf a8ce5c16d6 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-07-08 09:16:03 -07:00
Brian Behlendorf 23cff295e2 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-07-08 09:16:02 -07:00
Brian Behlendorf 5fc46112cb Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-07-08 09:16:01 -07:00
Brian Behlendorf b2e459dab0 Add explicit casts for (u_longlong_t) when printing uint64_t. 2009-07-08 09:07:13 -07:00
Brian Behlendorf 5534447477 Add explicit casts for (u_longlong_t) when printing uint64_t. 2009-07-08 09:06:03 -07:00
Brian Behlendorf 58f5e63293 Resolve a 2 new cases of for loop variable declared in for() 2009-07-08 09:05:37 -07:00
Brian Behlendorf b2dcbdf490 Resolve a 2 new cases of for loop variable declared in for() 2009-07-08 09:04:21 -07:00
Brian Behlendorf 28718acdab Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-07-07 17:13:35 -07:00
Brian Behlendorf 756d013735 Disable autoexpand notifing sysevent which is not supported. 2009-07-07 17:06:27 -07:00
Brian Behlendorf 7bd98c8239 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-07-07 16:35:34 -07:00
Brian Behlendorf a9f91536dd Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-07-07 16:35:30 -07:00
Brian Behlendorf 1ccb5e0a78 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-07-07 16:35:21 -07:00
Brian Behlendorf 795b008d80 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-07-07 16:35:18 -07:00
Brian Behlendorf f5f48f7488 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-07-07 16:35:09 -07:00
Brian Behlendorf 85f46e8651 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-07 16:35:05 -07:00
Brian Behlendorf 25483b5fea Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-07-07 16:34:56 -07:00
Brian Behlendorf 6c28ebf45a Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-07-07 16:34:53 -07:00
Brian Behlendorf e219b71123 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-07 16:34:44 -07:00