Brian Behlendorf
|
e588ef08cb
|
Revert contents of linux-have-zpl topic branch.
|
2009-11-15 16:06:10 -08: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
|
e5e4fadc34
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Conflicts:
module/zfs/dmu.c
module/zfs/dsl_deleg.c
module/zfs/rrwlock.c
module/zfs/vdev_raidz.c
|
2009-08-18 12:04:53 -07:00 |
|
Brian Behlendorf
|
45d1cae3b8
|
Rebase master to b121
|
2009-08-18 11:43:27 -07:00 |
|
Brian Behlendorf
|
a6b1465e30
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
Conflicts:
module/zfs/include/sys/zfs_fuid.h
module/zfs/zfs_fuid.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_vfsops.c
module/zfs/zfs_znode.c
|
2009-07-06 15:16:54 -07:00 |
|
Brian Behlendorf
|
e2b2597751
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Conflicts:
cmd/zdb/zdb_il.c
cmd/zfs/zfs_main.c
cmd/zinject/zinject.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_graph.c
module/zcommon/include/sys/fm/fs/zfs.h
module/zcommon/include/zfs_deleg.h
module/zcommon/include/zfs_namecheck.h
module/zcommon/zfs_deleg.c
module/zcommon/zfs_namecheck.c
module/zcommon/zprop_common.c
module/zfs/arc.c
module/zfs/dmu.c
module/zfs/dmu_object.c
module/zfs/dmu_objset.c
module/zfs/dsl_pool.c
module/zfs/dsl_prop.c
module/zfs/fletcher.c
module/zfs/include/sys/dsl_deleg.h
module/zfs/include/sys/dsl_prop.h
module/zfs/include/sys/metaslab_impl.h
module/zfs/include/sys/spa_boot.h
module/zfs/include/sys/zap.h
module/zfs/include/sys/zap_impl.h
module/zfs/include/sys/zfs_context.h
module/zfs/include/sys/zfs_ctldir.h
module/zfs/include/sys/zfs_dir.h
module/zfs/include/sys/zfs_fuid.h
module/zfs/include/sys/zfs_ioctl.h
module/zfs/spa.c
module/zfs/spa_errlog.c
module/zfs/spa_history.c
module/zfs/zap.c
module/zfs/zap_leaf.c
module/zfs/zap_micro.c
module/zfs/zfs_ioctl.c
module/zfs/zio.c
|
2009-07-02 16:49:11 -07:00 |
|
Brian Behlendorf
|
9babb37438
|
Rebase master to b117
|
2009-07-02 15:44:48 -07:00 |
|
Brian Behlendorf
|
af12291488
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
Conflicts:
module/zfs/rrwlock.c
module/zfs/zfs_replay.c
|
2009-03-11 11:22:11 -07:00 |
Ricardo M. Correia
|
af45030850
|
Added 'gcc-ident-pragmas' branch.
|
2009-03-11 10:59:45 -07:00 |
|
Brian Behlendorf
|
66a5ec0f7b
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-03-10 21:30:48 -07:00 |
|
Brian Behlendorf
|
c8e569dd1c
|
Build system and packaging (RPM support) (Part 2)
Complete support for dist install srpm and rpm make targets.
|
2009-03-10 21:13:30 -07:00 |
|
Brian Behlendorf
|
86a5af4d25
|
Update HAVE_ZPL bits for zfs_ioctl
|
2009-01-09 11:13:22 -08:00 |
|
Brian Behlendorf
|
593aa3e10d
|
Move all current Makefiles to correct locations, updates still needed
|
2008-12-11 14:55:55 -08:00 |
|
Brian Behlendorf
|
172bb4bd5e
|
Move the world out of /zfs/ and seperate out module build tree
|
2008-12-11 11:08:09 -08:00 |