Commit Graph

15538 Commits

Author SHA1 Message Date
Brian Behlendorf 6d772ec7d2 Required build 121 updates for linux-have-zpl 2009-08-18 14:11:06 -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 5a1c05899f Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-08-18 13:01:29 -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
Brian Behlendorf db54f7f949 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-08-18 12:59:31 -07:00
Brian Behlendorf 6e43f5a80b Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
Conflicts:

	module/zfs/rrwlock.c
	module/zfs/zfs_ioctl.c
2009-08-18 12:59:17 -07:00
Brian Behlendorf 4170f68722 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-08-18 12:36:01 -07:00
Brian Behlendorf 90e41b3d78 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-08-18 12:35:58 -07:00
Brian Behlendorf 88815d0378 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-08-18 12:35:46 -07:00
Brian Behlendorf 3e17f18dcc Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-08-18 12:35:43 -07:00
Brian Behlendorf 8fb2d8acf8 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-08-18 12:35:30 -07:00
Brian Behlendorf 543989b909 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-08-18 12:35:28 -07:00
Brian Behlendorf 324581a840 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-08-18 12:35:15 -07:00
Brian Behlendorf 8b02e1a43f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-08-18 12:35:12 -07:00
Brian Behlendorf 474d0301f5 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-08-18 12:34:59 -07:00
Brian Behlendorf 917a08a678 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-08-18 12:34:56 -07:00
Brian Behlendorf 79c98b6d13 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-08-18 12:34:43 -07:00
Brian Behlendorf a1909790e4 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-08-18 12:34:40 -07:00
Brian Behlendorf b9f7ba534b Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-08-18 12:34:27 -07:00
Brian Behlendorf 5f0eb517cf Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-08-18 12:34:24 -07:00
Brian Behlendorf e4fd5cfe2d Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-08-18 12:34:12 -07:00
Brian Behlendorf 1cf9e2582c Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-08-18 12:34:09 -07:00
Brian Behlendorf ed0cc120bc Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-08-18 12:33:57 -07:00
Brian Behlendorf b3561355b8 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-08-18 12:33:54 -07:00
Brian Behlendorf 905e51b755 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-08-18 12:33:41 -07:00
Brian Behlendorf 6a97dcc2bf Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-08-18 12:33:39 -07:00
Brian Behlendorf 7c3b0a4a2f Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-08-18 12:33:35 -07:00
Brian Behlendorf 3a2102242d Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-08-18 12:33:13 -07:00
Brian Behlendorf c9519311a3 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-08-18 12:33:10 -07:00
Brian Behlendorf 954484f75d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
Conflicts:

	module/zfs/dsl_dataset.c
	module/zfs/spa_history.c
2009-08-18 12:32:53 -07:00
Brian Behlendorf 5e2c5e25ed Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-08-18 12:30:23 -07:00
Brian Behlendorf 715534d082 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-08-18 12:30:20 -07:00
Brian Behlendorf 104e605279 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-08-18 12:30:07 -07:00
Brian Behlendorf df5482e65d Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-08-18 12:30:04 -07:00
Brian Behlendorf bfbf28a0d1 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-08-18 12:29:51 -07:00
Brian Behlendorf 2d067983d6 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-08-18 12:29:48 -07:00
Brian Behlendorf a50eeb2abe Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-08-18 12:29:35 -07:00
Brian Behlendorf f301459f0e Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-08-18 12:29:32 -07:00
Brian Behlendorf 769cc6425e Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-08-18 12:29:19 -07:00
Brian Behlendorf d5cfd05528 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-08-18 12:29:16 -07:00
Brian Behlendorf c67303e092 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
Conflicts:

	lib/libzfs/libzfs_dataset.c
	module/zfs/dsl_dataset.c
	module/zfs/rrwlock.c
	module/zfs/spa_history.c
	module/zfs/zfs_ioctl.c
2009-08-18 12:26:09 -07:00
Brian Behlendorf 198b2f4f04 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-08-18 12:11:01 -07:00