Brian Behlendorf
|
ab16fdc9ad
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-07-06 15:09:10 -07:00 |
|
Brian Behlendorf
|
a07dfef8bb
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-07-06 15:08:59 -07:00 |
|
Brian Behlendorf
|
d65102b493
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-07-06 15:08:57 -07:00 |
|
Brian Behlendorf
|
7edabe59cf
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
Conflicts:
lib/libzfs/libzfs_pool.c
|
2009-07-06 15:06:49 -07:00 |
|
Brian Behlendorf
|
409cfe5051
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
Conflicts:
lib/libzfs/libzfs_pool.c
|
2009-07-06 15:05:47 -07:00 |
|
Brian Behlendorf
|
55a2d87100
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-07-06 15:04:35 -07:00 |
|
Brian Behlendorf
|
49e32fb1f7
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-07-06 15:04:30 -07:00 |
|
Brian Behlendorf
|
3424ebe31a
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-07-06 15:04:20 -07:00 |
|
Brian Behlendorf
|
beac3749a1
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-07-06 15:04:17 -07:00 |
|
Brian Behlendorf
|
58d678604d
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-07-06 15:04:06 -07:00 |
|
Brian Behlendorf
|
2b582c34cb
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
Conflicts:
module/zfs/zfs_ioctl.c
|
2009-07-06 15:03:54 -07:00 |
|
Brian Behlendorf
|
e4f45cfc2a
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-06 15:03:12 -07:00 |
|
Brian Behlendorf
|
f48b799f78
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-07-06 15:03:09 -07:00 |
|
Brian Behlendorf
|
655f8fdf53
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-07-06 15:02:58 -07:00 |
|
Brian Behlendorf
|
b56250900b
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-07-06 15:02:55 -07:00 |
|
Brian Behlendorf
|
bef6e372a5
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-07-06 15:02:44 -07:00 |
|
Brian Behlendorf
|
ae68a8980c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
Conflicts:
module/zfs/include/sys/dmu.h
|
2009-07-06 15:02:33 -07:00 |
|
Brian Behlendorf
|
1cf1a077cd
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
Conflicts:
module/zfs/dmu.c
module/zfs/include/sys/dmu.h
|
2009-07-06 15:00:24 -07:00 |
|
Brian Behlendorf
|
fea9afe067
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-07-06 13:47:19 -07:00 |
|
Brian Behlendorf
|
4fa3570131
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-07-06 13:47:16 -07:00 |
|
Brian Behlendorf
|
266a7d8cd7
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
Conflicts:
module/zcommon/zfs_namecheck.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zap_micro.c
|
2009-07-06 13:47:04 -07:00 |
|
Brian Behlendorf
|
a48d22447a
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-07-06 13:44:59 -07:00 |
|
Brian Behlendorf
|
6e96138f82
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-07-06 13:44:56 -07:00 |
|
Brian Behlendorf
|
603ea7cb6b
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-07-06 13:44:45 -07:00 |
|
Brian Behlendorf
|
6c3580cc05
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-07-06 13:44:42 -07:00 |
|
Brian Behlendorf
|
60f715b087
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-07-06 13:44:31 -07:00 |
|
Brian Behlendorf
|
053043b2d0
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
Conflicts:
lib/libzfs/libzfs_pool.c
|
2009-07-06 13:44:19 -07:00 |
|
Brian Behlendorf
|
a30238acc3
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-07-06 13:43:26 -07:00 |
|
Brian Behlendorf
|
a33c6c25d2
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-07-06 13:43:22 -07:00 |
|
Brian Behlendorf
|
163605ce72
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-07-06 13:43:10 -07:00 |
|
Brian Behlendorf
|
4a7761abd2
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-07-06 13:43:07 -07:00 |
|
Brian Behlendorf
|
ef26e986b0
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-07-06 13:42:56 -07:00 |
|
Brian Behlendorf
|
e4e9588991
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-07-06 13:42:54 -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
|
e3d05c97eb
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-07-06 13:17:32 -07:00 |
|
Brian Behlendorf
|
658459249e
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-07-06 13:17:28 -07:00 |
|
Brian Behlendorf
|
926b04acba
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Conflicts:
cmd/ztest/ztest.c
|
2009-07-06 13:17:16 -07:00 |
|
Brian Behlendorf
|
8d4f19348a
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2009-07-06 13:16:34 -07:00 |
|
Brian Behlendorf
|
2838dba2c4
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2009-07-06 13:16:32 -07:00 |
|
Brian Behlendorf
|
cd098f87c8
|
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
Conflicts:
cmd/ztest/ztest.c
|
2009-07-06 13:16:29 -07:00 |
|
Brian Behlendorf
|
8795d8f034
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2009-07-06 13:15:43 -07:00 |
|
Brian Behlendorf
|
95ba24ed69
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Conflicts:
cmd/ztest/ztest.c
|
2009-07-06 13:15:35 -07:00 |
|
Brian Behlendorf
|
d369760713
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2009-07-06 13:14:41 -07:00 |
|
Brian Behlendorf
|
4e59805d98
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-07-06 13:14:36 -07:00 |
|
Brian Behlendorf
|
4ac493854e
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-07-06 13:14:20 -07:00 |
|
Brian Behlendorf
|
1851e0622f
|
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
|
2009-07-06 13:14:18 -07:00 |
|
Brian Behlendorf
|
f6c61972e1
|
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
|
2009-07-06 13:14:18 -07:00 |
|
Brian Behlendorf
|
ab14c47f14
|
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
|
2009-07-06 13:14:13 -07:00 |
|
Brian Behlendorf
|
4de6678930
|
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
|
2009-07-06 13:14:13 -07:00 |
|
Brian Behlendorf
|
5ab66031b7
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-07-06 13:14:08 -07:00 |