Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity
11,495 Commits 42 Branches 132 Tags 228 MiB
Commit Graph

93 Commits

Author SHA1 Message Date
Brian Behlendorf bf200630f9 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 
Conflicts:
	module/zfs/rrwlock.c
	module/zfs/spa_boot.c
	module/zfs/zfs_replay.c
 2009-03-11 11:12:24 -07:00
Brian Behlendorf 5f30a3cb0e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 11:09:11 -07:00
Brian Behlendorf 8fe801fd8f Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2009-03-11 11:00:42 -07:00
Ricardo M. Correia af45030850 Added 'gcc-ident-pragmas' branch. 2009-03-11 10:59:45 -07:00
Brian Behlendorf 73c738d1ce Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-11 10:40:37 -07:00
Brian Behlendorf d43e9ca262 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 10:40:31 -07:00
Brian Behlendorf d641369d38 Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch 2009-03-11 10:32:45 -07:00
Ricardo M. Correia fd9a7a0fb4 Add 'ull' suffix to 64-bit constants. 2009-03-11 10:31:24 -07:00
Brian Behlendorf 8090a9a908 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 
Conflicts:

	cmd/zpool/zpool_main.c
 2009-02-18 14:31:46 -08:00
Brian Behlendorf f0a8aedfbc Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 
Conflicts:

	lib/libzpool/kernel.c
	module/zfs/arc.c
 2009-02-18 14:27:12 -08:00
Brian Behlendorf f686a87058 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 
Conflicts:

	module/zfs/arc.c
 2009-02-18 13:12:26 -08:00
Brian Behlendorf d164b20935 Rebase master to b108 2009-02-18 12:51:31 -08:00
Brian Behlendorf 1f372d9030 Resolve conflict with removed cleaner type 2009-01-15 14:18:01 -08:00
Brian Behlendorf da7151a89e Resolve conflict with removed cleaner type 2009-01-15 14:11:19 -08:00
Brian Behlendorf 3fa768e21b Resolve conflict with removed cleaner type 2009-01-15 14:04:35 -08:00
Brian Behlendorf fb5f0bc833 Rebase master to b105 2009-01-15 13:59:39 -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 4a5bd7a3a8 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-13 15:02:11 -08:00
Brian Behlendorf bec036636e List cleanup and use of list_node_init initializer 2009-01-13 15:00:12 -08:00
Brian Behlendorf 1cf2f6a63e Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-09 15:57:21 -08:00
Brian Behlendorf 1475f7234b Make the ZPL only bits conditional 2009-01-09 15:55:19 -08:00
Brian Behlendorf 2148f8256b Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-09 15:52:02 -08:00
Brian Behlendorf ca3acc4f50 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-09 15:52:00 -08:00
Brian Behlendorf 1dc5e6d02e Remove HAVE_SPL should be HAVE_ZPL 2009-01-09 15:50:00 -08:00
Brian Behlendorf 3e9ecdb05d Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-06 08:44:14 -08:00
Brian Behlendorf 4522c570e8 Add missing prototype 2009-01-06 08:39:45 -08:00
Brian Behlendorf 37fbec5b71 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-05 16:59:36 -08:00
Brian Behlendorf 3a1f0dcde1 Refresh prototype due to upstream changes 2009-01-05 16:53:23 -08:00
Brian Behlendorf d92640af02 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-23 13:49:56 -08:00
Brian Behlendorf ffb8773241 Take out page map functions for now 2008-12-23 13:47:22 -08:00
Brian Behlendorf 642a64b7bd Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-23 13:13:37 -08:00
Brian Behlendorf 4177b4715d Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-23 13:13:37 -08:00
Brian Behlendorf 028f170442 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-23 13:13:32 -08:00
Brian Behlendorf 57048fa6fa Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-23 13:13:30 -08:00
Brian Behlendorf 7725fe7431 Remove CPU_SEQID from context, available in SPL. Additionally add module magic for zcommon 2008-12-23 13:11:03 -08:00
Brian Behlendorf a6d6f31db6 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-22 12:09:08 -08:00
Brian Behlendorf d7d260b870 Removing branch to readd under new name 2008-12-22 12:05:11 -08:00
Brian Behlendorf 72f9288f09 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 11:08:24 -08:00
Brian Behlendorf d51e1b0eeb Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 11:08:23 -08:00
Brian Behlendorf 90ed9826ab Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-22 11:08:18 -08:00
Brian Behlendorf 22f583b0f5 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-22 11:08:17 -08:00
Brian Behlendorf 09de417e20 Move #endif up to expose userspace bits 2008-12-22 11:01:35 -08:00
Brian Behlendorf caac73b67d Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-18 11:39:34 -08:00
Brian Behlendorf 0b5b1b5cc0 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-18 11:39:29 -08:00
Brian Behlendorf 60b7c664e0 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-18 11:39:15 -08:00
Brian Behlendorf 8b46ed9359 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-18 11:39:14 -08:00
Brian Behlendorf 944fd8ad8c Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-18 11:39:07 -08:00
Brian Behlendorf bf57b913fb Revert commit_cb feature 2008-12-18 11:39:02 -08:00
Brian Behlendorf 612f7c20d1 Revert commit_cb feature 2008-12-18 11:37:08 -08:00
Brian Behlendorf 9ae2c70438 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2008-12-18 11:34:25 -08:00