Brian Behlendorf
|
acf6f07ace
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2010-08-09 16:51:26 -07:00 |
|
Brian Behlendorf
|
dd11e3f7f0
|
Limit sysfs name to KOBJ_NAME_LEN
See commit dfc166d174 for details.
|
2010-08-09 16:45:38 -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
|
45d1cae3b8
|
Rebase master to b121
|
2009-08-18 11:43:27 -07:00 |
|
Brian Behlendorf
|
149c4b2731
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:
cmd/ztest/ztest.c
lib/libzfs/libzfs_pool.c
module/zcommon/zfs_namecheck.c
module/zfs/dmu.c
module/zfs/include/sys/dmu.h
module/zfs/include/sys/zfs_fuid.h
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zap_micro.c
module/zfs/zfs_fuid.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_vfsops.c
module/zfs/zfs_znode.c
|
2009-07-06 13:40:29 -07:00 |
|
Brian Behlendorf
|
9babb37438
|
Rebase master to b117
|
2009-07-02 15:44:48 -07:00 |
|
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 |
Ricardo M. Correia
|
af45030850
|
Added 'gcc-ident-pragmas' branch.
|
2009-03-11 10:59:45 -07:00 |
|
Brian Behlendorf
|
aca9d98817
|
Fix conflict
|
2008-12-11 11:34:16 -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 |