zfs/module/zfs
Brian Behlendorf 9a0cb95b1b Resolve conflict 2009-01-05 12:38:23 -08:00
..
include/sys Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-23 13:49:56 -08:00
Makefile.in Add unicode makefile references and support 2009-01-05 12:33:09 -08:00
arc.c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-23 16:36:37 -08:00
bplist.c Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00
dbuf.c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 11:36:00 -08:00
dmu.c Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-17 17:02:53 -08:00
dmu_object.c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 11:36:00 -08:00
dmu_objset.c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 09:05:57 -08:00
dmu_send.c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-18 13:52:21 -08:00
dmu_traverse.c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 11:36:00 -08:00
dmu_tx.c Revert commit_cb feature 2008-12-18 11:39:02 -08:00
dmu_zfetch.c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-18 13:27:14 -08:00
dnode.c Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 11:51:23 -08:00
dnode_sync.c Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 11:25:42 -08:00
dsl_dataset.c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 11:36:00 -08:00
dsl_deleg.c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 11:36:00 -08:00
dsl_dir.c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 11:36:00 -08:00
dsl_pool.c Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 11:25:42 -08:00
dsl_prop.c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 11:36:00 -08:00
dsl_scrub.c Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00
dsl_synctask.c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 11:36:00 -08:00
fletcher.c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 11:36:00 -08:00
gzip.c Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 11:25:42 -08:00
lzjb.c Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 11:24:45 -08:00
metaslab.c Fix all instances of for (int i;;) {} that were easily found 2008-12-19 11:03:54 -08:00
refcount.c Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 11:24:45 -08:00
rrwlock.c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 13:51:21 -08:00
sha256.c Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00
spa.c Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-22 12:09:08 -08:00
spa_boot.c Only allow this for the kernel 2008-12-22 13:33:06 -08:00
spa_config.c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 11:36:00 -08:00
spa_errlog.c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 11:36:00 -08:00
spa_history.c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 11:36:00 -08:00
spa_misc.c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 11:06:25 -08:00
space_map.c Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 11:25:42 -08:00
txg.c Revert commit_cb feature 2008-12-18 11:39:02 -08:00
uberblock.c Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00
unique.c Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00
vdev.c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 11:06:25 -08:00
vdev_cache.c Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 11:24:45 -08:00
vdev_disk.c Don't make this fatal for userspace 2008-12-22 13:32:19 -08:00
vdev_file.c Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00
vdev_label.c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 13:47:22 -08:00
vdev_mirror.c Fix all instances of for (int i;;) {} that were easily found 2008-12-19 11:03:54 -08:00
vdev_missing.c Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00
vdev_queue.c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 11:06:25 -08:00
vdev_raidz.c Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 11:05:48 -08:00
vdev_root.c Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00
zap.c Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-11 11:27:12 -08:00
zap_leaf.c Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 11:24:45 -08:00
zap_micro.c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 11:36:00 -08:00
zfs_acl.c Make ZPL conditional 2008-12-22 13:46:30 -08:00
zfs_byteswap.c Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 11:24:45 -08:00
zfs_ctldir.c Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00
zfs_dir.c Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00
zfs_fm.c Fix conflict 2008-12-11 11:34:16 -08:00
zfs_fuid.c Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00
zfs_ioctl.c Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-22 12:42:04 -08:00
zfs_log.c Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00
zfs_replay.c Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00
zfs_rlock.c Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00
zfs_vfsops.c Start linux-have-zpl layer 2008-12-22 12:23:27 -08:00
zfs_vnops.c Take out page map functions for now 2008-12-23 13:47:22 -08:00
zfs_znode.c Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-22 12:09:08 -08:00
zil.c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-11 11:36:00 -08:00
zio.c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 12:38:25 -08:00
zio_checksum.c Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00
zio_compress.c Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00
zio_inject.c Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00
zvol.c Fix typo 2008-12-22 14:52:15 -08:00