Commit Graph

14829 Commits

Author SHA1 Message Date
Brian Behlendorf 7511ee93b8 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-08-18 14:21:50 -07:00
Brian Behlendorf cd710627dd Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-08-18 14:21:47 -07:00
Brian Behlendorf 7c2fdfbc49 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-08-18 14:21:38 -07:00
Brian Behlendorf 060284b353 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-08-18 14:21:35 -07:00
Brian Behlendorf ed5db69c5d Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-08-18 14:21:26 -07:00
Brian Behlendorf 0076202c0f Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-08-18 14:21:23 -07:00
Brian Behlendorf a92654d324 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-08-18 14:21:13 -07:00
Brian Behlendorf a8b8cc4801 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-08-18 14:21:10 -07:00
Brian Behlendorf 15ccc2b9a4 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-08-18 14:21:01 -07:00
Brian Behlendorf 1c5a67a320 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-08-18 14:20:58 -07:00
Brian Behlendorf 2203d54992 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-08-18 14:20:49 -07:00
Brian Behlendorf f3f51aee8c Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-08-18 14:20:46 -07:00
Brian Behlendorf 1d5a7b235b Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-08-18 14:20:37 -07:00
Brian Behlendorf bc611acf53 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-08-18 14:20:35 -07:00
Brian Behlendorf 1f9ee8f414 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-08-18 14:20:25 -07:00
Brian Behlendorf d2450a3d32 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-08-18 14:20:23 -07:00
Brian Behlendorf 431189f377 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-08-18 14:20:21 -07:00
Brian Behlendorf 623479aa05 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-08-18 14:20:01 -07:00
Brian Behlendorf 5edf1e174e Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-08-18 14:19:58 -07:00
Brian Behlendorf ad97c53c74 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-08-18 14:19:57 -07:00
Brian Behlendorf f4299088a8 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-08-18 14:19:40 -07:00
Brian Behlendorf ca2e28b8eb Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-08-18 14:19:37 -07:00
Brian Behlendorf 3a1480dc57 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-08-18 14:19:27 -07:00
Brian Behlendorf 2d5d5fbc92 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-08-18 14:19:25 -07:00
Brian Behlendorf 9a43a2047f Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-08-18 14:19:16 -07:00
Brian Behlendorf 87bdf80fb7 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-08-18 14:19:13 -07:00
Brian Behlendorf 4e57444943 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-08-18 14:19:04 -07:00
Brian Behlendorf 63bb0f5fab Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-08-18 14:19:01 -07:00
Brian Behlendorf 90cd4a6425 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-08-18 14:18:52 -07:00
Brian Behlendorf 90f5488896 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-08-18 14:18:49 -07:00
Brian Behlendorf 147adbe815 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-08-18 14:18:40 -07:00
Brian Behlendorf 1092769f23 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-08-18 14:18:38 -07:00
Brian Behlendorf e4b55cfbff Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-08-18 14:18:36 -07:00
Brian Behlendorf 5d83878f46 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-08-18 14:18:34 -07:00
Brian Behlendorf 21ccfb65d6 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-08-18 14:18:33 -07:00
Brian Behlendorf e134b976b6 Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2009-08-18 14:18:33 -07:00
Brian Behlendorf ef74bed821 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2009-08-18 14:18:32 -07:00
Brian Behlendorf f3ddd9d082 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-08-18 14:18:32 -07:00
Brian Behlendorf 8767bb3fdd Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-08-18 14:18:31 -07:00
Brian Behlendorf 4de2019bdd Required build 121 updates for linux-have-zvol 2009-08-18 14:11:29 -07:00
Brian Behlendorf 218ddf3d52 Required build 121 updates for linux-kernel-module 2009-08-18 14:10:33 -07:00
Brian Behlendorf f9a74de46a Required build 121 updates for gcc-uninit 2009-08-18 14:09:35 -07:00
Brian Behlendorf 08f5b3c23d Required build 121 updates for gcc-shadow 2009-08-18 14:09:15 -07:00
Brian Behlendorf b29c1f87a0 Required build 121 updates for gcc-missing-braces 2009-08-18 14:08:46 -07:00
Brian Behlendorf d42b88372f Required build 121 updates for gcc-c90 2009-08-18 14:07:25 -07:00
Brian Behlendorf 5b4a08d0f4 Move ZPIOS chunk to linux-zpios topic branch 2009-08-18 14:06:05 -07:00
Brian Behlendorf ab350991fc Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-08-18 13:01:26 -07:00
Brian Behlendorf 3b0f514c88 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
Conflicts:

	lib/libzfs/libzfs_dataset.c
2009-08-18 13:01:12 -07:00
Brian Behlendorf eef76872b9 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-08-18 12:59:47 -07:00
Brian Behlendorf bc17042a77 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-08-18 12:59:44 -07:00