Brian Behlendorf
|
4731dddff1
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:51:48 -07:00 |
|
Brian Behlendorf
|
b3ae413d42
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:51:46 -07:00 |
|
Brian Behlendorf
|
34dcb41825
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
Conflicts:
module/zfs/txg.c
|
2010-05-27 13:51:38 -07:00 |
|
Brian Behlendorf
|
c8e1e0f44b
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2010-05-27 13:51:06 -07:00 |
|
Brian Behlendorf
|
26cdc5805c
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:51:06 -07:00 |
|
Brian Behlendorf
|
3606d39c0e
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:51:04 -07:00 |
|
Brian Behlendorf
|
7685b5a954
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2010-05-27 13:51:03 -07:00 |
|
Brian Behlendorf
|
5cad1e175d
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
Conflicts:
module/zfs/dmu_tx.c
module/zfs/txg.c
|
2010-05-27 13:48:54 -07:00 |
|
Brian Behlendorf
|
d8e5eb56b8
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2010-05-27 13:42:00 -07:00 |
|
Brian Behlendorf
|
daac7114d5
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2010-05-27 13:42:00 -07:00 |
|
Brian Behlendorf
|
028e42b692
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2010-05-27 13:42:00 -07:00 |
|
Brian Behlendorf
|
cde6e6fec8
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2010-05-27 13:40:15 -07:00 |
|
Brian Behlendorf
|
1dc4235011
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2010-05-27 13:40:14 -07:00 |
|
Brian Behlendorf
|
ca50214549
|
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
|
2010-05-27 13:40:14 -07:00 |
|
Brian Behlendorf
|
1e32b3c781
|
Revert feature-commit-cb feature upstream
We can drop this feature and we will pick up the lastest version
during the b141 update.
|
2010-05-27 13:39:17 -07:00 |
|
Brian Behlendorf
|
bcba44335a
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2010-05-27 13:37:43 -07:00 |
|
Brian Behlendorf
|
9ea3febcbd
|
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
|
2010-05-27 13:37:43 -07:00 |
|
Brian Behlendorf
|
e996eb2c7b
|
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:37:43 -07:00 |
|
Brian Behlendorf
|
b27c56ec0b
|
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:37:41 -07:00 |
|
Brian Behlendorf
|
1cebc0b2e1
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2010-05-27 13:37:40 -07:00 |
|
Brian Behlendorf
|
1ed7d4dcff
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2010-05-27 13:37:40 -07:00 |
|
Brian Behlendorf
|
adcda92e0a
|
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:37:36 -07:00 |
|
Brian Behlendorf
|
48ef5ee10e
|
Merge commit 'refs/top-bases/linux-events' into linux-events
|
2010-05-27 13:37:35 -07:00 |
|
Brian Behlendorf
|
cff827fb56
|
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
|
2010-05-27 13:37:33 -07:00 |
|
Brian Behlendorf
|
55c86e32d6
|
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:37:33 -07:00 |
|
Brian Behlendorf
|
d7e7351d11
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2010-05-27 13:37:30 -07:00 |
|
Brian Behlendorf
|
344a3f8a5b
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:37:30 -07:00 |
|
Brian Behlendorf
|
c886f405ea
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2010-05-27 13:37:28 -07:00 |
|
Brian Behlendorf
|
8a1e5f4627
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:37:28 -07:00 |
|
Brian Behlendorf
|
7ea5707a03
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:37:25 -07:00 |
|
Brian Behlendorf
|
87875a5eb3
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
Conflicts:
lib/libzpool/include/sys/zfs_context.h
|
2010-05-27 13:37:20 -07:00 |
|
Brian Behlendorf
|
c5f0856203
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2010-05-27 13:36:29 -07:00 |
|
Brian Behlendorf
|
b4af152def
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:36:29 -07:00 |
|
Brian Behlendorf
|
347a7532bc
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:36:27 -07:00 |
|
Brian Behlendorf
|
f6d7ca841c
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2010-05-27 13:36:26 -07:00 |
|
Brian Behlendorf
|
07bb559bb7
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:36:24 -07:00 |
|
Brian Behlendorf
|
9f83c4b546
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
Conflicts:
lib/libzpool/kernel.c
|
2010-05-27 13:36:18 -07:00 |
|
Brian Behlendorf
|
37679a13f1
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2010-05-27 13:35:54 -07:00 |
|
Brian Behlendorf
|
119b6893bf
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:35:54 -07:00 |
|
Brian Behlendorf
|
9d688fef79
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2010-05-27 13:35:51 -07:00 |
|
Brian Behlendorf
|
8e7d01c64f
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:35:51 -07:00 |
|
Brian Behlendorf
|
6ae751580c
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:35:49 -07:00 |
|
Brian Behlendorf
|
853b63df77
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2010-05-27 13:35:48 -07:00 |
|
Brian Behlendorf
|
490242e7b7
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2010-05-27 13:35:46 -07:00 |
|
Brian Behlendorf
|
6ad808a6ba
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:35:46 -07:00 |
|
Brian Behlendorf
|
95885a2f68
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
Conflicts:
lib/libzpool/include/sys/zfs_context.h
lib/libzpool/kernel.c
|
2010-05-27 13:35:09 -07:00 |
|
Brian Behlendorf
|
c17d3e05eb
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2010-05-27 13:32:58 -07:00 |
|
Brian Behlendorf
|
06cd2491e5
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2010-05-27 13:32:58 -07:00 |
|
Brian Behlendorf
|
51536ea5f4
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2010-05-27 13:32:58 -07:00 |
|
Brian Behlendorf
|
a082023842
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
Conflicts:
cmd/ztest/ztest.c
lib/libzpool/include/sys/zfs_context.h
lib/libzpool/kernel.c
lib/libzpool/taskq.c
|
2010-05-27 13:30:48 -07:00 |