Commit Graph

18334 Commits

Author SHA1 Message Date
Brian Behlendorf d16d31dd39 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-05-27 13:57:27 -07:00
Brian Behlendorf 38f5286432 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-27 13:57:26 -07:00
Brian Behlendorf ea9a828903 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-05-27 13:57:24 -07:00
Brian Behlendorf 0120d2d7c8 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-05-27 13:57:24 -07:00
Brian Behlendorf cd2e824900 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-27 13:57:21 -07:00
Brian Behlendorf 35db44331c Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-05-27 13:57:21 -07:00
Brian Behlendorf 07911c887e Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-05-27 13:57:19 -07:00
Brian Behlendorf 28da18c724 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-05-27 13:57:19 -07:00
Brian Behlendorf 59104b4325 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-27 13:57:16 -07:00
Brian Behlendorf 249ae381e1 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2010-05-27 13:57:16 -07:00
Brian Behlendorf 64e23a4c7a Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-05-27 13:57:16 -07:00
Brian Behlendorf d2e83956de Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-05-27 13:57:16 -07:00
Brian Behlendorf 262c747b4c Remove feature-pthreads topic branch 2010-05-27 13:54:07 -07:00
Brian Behlendorf 9e8bb2aae4 Merge commit 'refs/top-bases/linux-user-util' into linux-user-util 2010-05-27 13:53:15 -07:00
Brian Behlendorf d86abf3c29 Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch 2010-05-27 13:53:15 -07:00
Brian Behlendorf 8605817009 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-27 13:53:12 -07:00
Brian Behlendorf 84633aa1a1 Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 2010-05-27 13:53:12 -07:00
Brian Behlendorf 0ee82dae98 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
Conflicts:
	module/zfs/dmu_tx.c
2010-05-27 13:53:07 -07:00
Brian Behlendorf 7b4446a766 Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-05-27 13:52:10 -07:00
Brian Behlendorf fd3ff8f53e Merge commit 'refs/top-bases/linux-events' into linux-events 2010-05-27 13:52:09 -07:00
Brian Behlendorf 1c2ab6981b Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-05-27 13:52:07 -07:00
Brian Behlendorf a1b6f08cd8 Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-05-27 13:52:07 -07:00
Brian Behlendorf 11a2b545a1 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-05-27 13:52:04 -07:00
Brian Behlendorf b783864dab Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-05-27 13:52:04 -07:00
Brian Behlendorf 64c35deecd Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-05-27 13:52:02 -07:00
Brian Behlendorf d0b2e31cd0 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-05-27 13:52:02 -07:00
Brian Behlendorf 121f267780 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-05-27 13:51:59 -07:00
Brian Behlendorf e35fb1fe8b Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-05-27 13:51:59 -07:00
Brian Behlendorf e3143a4d1b Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-05-27 13:51:57 -07:00
Brian Behlendorf a400748253 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-05-27 13:51:56 -07:00
Brian Behlendorf 1bc4e2719d Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-05-27 13:51:54 -07:00
Brian Behlendorf 7beff079bd Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-05-27 13:51:54 -07:00
Brian Behlendorf 9a6d4c547a Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-05-27 13:51:51 -07:00
Brian Behlendorf 91d426af85 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-05-27 13:51:51 -07:00
Brian Behlendorf ec12bc1f02 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-27 13:51:48 -07:00
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 028e42b692 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-27 13:42:00 -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 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