8795d8f034
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2009-07-06 13:15:43 -07:00
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
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
01c3cfc58f
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
...
Conflicts:
module/zfs/zil.c
2009-07-06 13:12:23 -07:00
a1ccb00b7e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
module/zfs/zil.c
2009-07-06 13:11:34 -07:00
a06a428e15
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
...
Conflicts:
cmd/zdb/zdb_il.c
cmd/zinject/zinject.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/dmu_object.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_errlog.c
module/zfs/spa_history.c
module/zfs/zap.c
module/zfs/zap_leaf.c
module/zfs/zap_micro.c
2009-07-02 17:06:20 -07:00
5a2a5d64a5
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-07-02 16:51:09 -07:00
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
9babb37438
Rebase master to b117
2009-07-02 15:44:48 -07:00
4f2dfa3c94
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-19 21:13:11 -07:00
b08807315c
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-19 21:09:02 -07:00
57c6cf3c4c
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-19 21:08:41 -07:00
bf3d911bc1
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-19 21:08:39 -07:00
0173e5dce7
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-19 21:08:22 -07:00
275f4aae5d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
...
Conflicts:
module/zfs/dmu_tx.c
2009-03-19 21:08:17 -07:00
4b56c30982
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-03-19 21:07:10 -07:00
7f33364d3c
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzpool/include/sys/zfs_context.h
module/zfs/dmu_tx.c
module/zfs/txg.c
2009-03-19 21:03:58 -07:00
eb811f7fa9
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/txg.h
2009-03-19 20:59:12 -07:00
f180959bac
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-03-19 20:51:18 -07:00
29703a5b4e
Add 'feature-commit-cb' branch for DMU commit callbacks.
2009-03-19 20:30:14 -07:00
a9eba02cdb
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-19 15:31:53 -07:00
7c39f7c920
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-19 15:30:57 -07:00
852952d742
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-19 15:30:44 -07:00
146fb170ef
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-19 15:30:43 -07:00
86681399b8
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-19 15:30:33 -07:00
e1540e9cbb
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-19 15:30:32 -07:00
e4b719f8f4
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-03-19 15:30:21 -07:00
7e8fa40f4d
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-19 15:29:38 -07:00
2518c98d9e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-19 15:29:34 -07:00
c8c4948d00
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2009-03-19 15:29:33 -07:00
60d25f4b93
The patch resolves the extra call to dnode_cons() in dnode_create().
...
The extra call to the constructor was there to reinitialize the non-
trivial primatives in the dnode (lists, mutexs, condvars, avl tree, etc).
This was safe, although not exactly clean, on Solaris because none of
the primitives allocate memory. In the Linux port this is not true.
To keep stack usage to a minimum several of the primatives dynamically
allocate memory thus initializing them twice results in a memory leak.
This patch resolves this problem for Solaris and Linux by ensuring all
*_inits are called in the constructor, and all *_destroys are called
in the destructor. Additionally we ensure that all dnode objects are
properly deconstructed before being freed to the slab, and when the
objects are allocated from the slab all required data members are
explicity initialized to correct values.
2009-03-19 15:22:48 -07:00
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
fbe3b02667
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-11 11:18:54 -07:00
f39cd76b0b
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-11 11:18:05 -07:00
96cc021270
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-11 11:18:01 -07:00
d402ab0f39
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-11 11:17:38 -07:00
7a08ef9d52
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
...
Conflicts:
module/zfs/spa_boot.c
2009-03-11 11:17:23 -07:00
9d1e987b15
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-03-11 11:16:32 -07:00
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
5f30a3cb0e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 11:09:11 -07:00
8fe801fd8f
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-03-11 11:00:42 -07:00
af45030850
Added 'gcc-ident-pragmas' branch.
2009-03-11 10:59:45 -07:00
2ff4ee3cae
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-11 10:44:51 -07:00
4f57a6ccb6
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-11 10:43:09 -07:00
a3da614c79
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-11 10:42:31 -07:00
4231a48b17
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-11 10:42:30 -07:00
5f4e78b6cc
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-11 10:42:10 -07:00
5067076033
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-11 10:42:09 -07:00
9dca58253e
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-03-11 10:41:48 -07:00
73c738d1ce
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-11 10:40:37 -07:00
d43e9ca262
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 10:40:31 -07:00
d641369d38
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-03-11 10:32:45 -07:00
fd9a7a0fb4
Add 'ull' suffix to 64-bit constants.
2009-03-11 10:31:24 -07:00
7b8eca908f
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
...
Conflicts:
cmd/zpool/zpool_main.c
2009-02-18 14:38:20 -08:00
3d4185ed1d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-02-18 14:35:43 -08:00
47c6526993
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-02-18 14:35:09 -08:00
8241395b5a
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-02-18 14:35:05 -08:00
855a863bb2
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-02-18 14:34:48 -08:00
9f4865e4ca
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-02-18 14:34:45 -08:00
f90944a9f0
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-02-18 14:34:25 -08:00
8090a9a908
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/zpool/zpool_main.c
2009-02-18 14:31:46 -08:00
87307ab12a
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-02-18 14:30:48 -08:00
6fe19bd252
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
...
Conflicts:
lib/libzpool/kernel.c
module/zfs/arc.c
2009-02-18 14:28:15 -08:00
f0a8aedfbc
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
...
Conflicts:
lib/libzpool/kernel.c
module/zfs/arc.c
2009-02-18 14:27:12 -08:00
fc8954db24
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-02-18 13:12:48 -08:00
f686a87058
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/arc.c
2009-02-18 13:12:26 -08:00
d164b20935
Rebase master to b108
2009-02-18 12:51:31 -08:00
adcb983918
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-15 14:22:14 -08:00
465b2c795d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-15 14:21:24 -08:00
924bc262cc
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-15 14:21:05 -08:00
ee1faab64d
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-15 14:21:03 -08:00
767928dcd2
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-15 14:20:55 -08:00
091a4a4ca4
Resolve conflict with removed cleaner type
2009-01-15 14:20:49 -08:00
4ceec4a504
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-01-15 14:19:18 -08:00
1f372d9030
Resolve conflict with removed cleaner type
2009-01-15 14:18:01 -08:00
27cf20b0d6
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-01-15 14:16:19 -08:00
551838a6c8
Resolve conflict with removed cleaner type
2009-01-15 14:13:39 -08:00
da7151a89e
Resolve conflict with removed cleaner type
2009-01-15 14:11:19 -08:00
86e39f5e3b
Resolve conflict with removed cleaner type
2009-01-15 14:05:21 -08:00
3fa768e21b
Resolve conflict with removed cleaner type
2009-01-15 14:04:35 -08:00
fb5f0bc833
Rebase master to b105
2009-01-15 13:59:39 -08:00
14f8f1d4bf
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-13 15:03:50 -08:00
e095be1cc5
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-13 15:03:12 -08:00
28d3375587
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-13 15:02:58 -08:00
3486f62c97
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-13 15:02:57 -08:00
fd1da7d6b9
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-13 15:02:50 -08:00
042deede25
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-13 15:02:49 -08:00
cb2016c3a0
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-01-13 15:02:42 -08:00
149c57fd06
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-13 15:02:15 -08:00
4a5bd7a3a8
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-13 15:02:11 -08:00
bec036636e
List cleanup and use of list_node_init initializer
2009-01-13 15:00:12 -08:00
1cf2f6a63e
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-01-09 15:57:21 -08:00
1475f7234b
Make the ZPL only bits conditional
2009-01-09 15:55:19 -08:00
c0f45a99fc
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-09 15:52:08 -08:00
3f70ee0f8a
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-09 15:52:07 -08:00
2148f8256b
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-01-09 15:52:02 -08:00
ca3acc4f50
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-09 15:52:00 -08:00
1dc5e6d02e
Remove HAVE_SPL should be HAVE_ZPL
2009-01-09 15:50:00 -08:00
3e9ecdb05d
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-01-06 08:44:14 -08:00
4522c570e8
Add missing prototype
2009-01-06 08:39:45 -08:00
37fbec5b71
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-01-05 16:59:36 -08:00
3a1f0dcde1
Refresh prototype due to upstream changes
2009-01-05 16:53:23 -08:00
d92640af02
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2008-12-23 13:49:56 -08:00
ffb8773241
Take out page map functions for now
2008-12-23 13:47:22 -08:00
4177b4715d
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-23 13:13:37 -08:00
642a64b7bd
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-23 13:13:37 -08:00
028f170442
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2008-12-23 13:13:32 -08:00
57048fa6fa
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-23 13:13:30 -08:00
7725fe7431
Remove CPU_SEQID from context, available in SPL. Additionally add module magic for zcommon
2008-12-23 13:11:03 -08:00
a6d6f31db6
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-22 12:09:08 -08:00
d7d260b870
Removing branch to readd under new name
2008-12-22 12:05:11 -08:00
72f9288f09
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-22 11:08:24 -08:00
d51e1b0eeb
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-22 11:08:23 -08:00
90ed9826ab
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2008-12-22 11:08:18 -08:00
22f583b0f5
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-22 11:08:17 -08:00
09de417e20
Move #endif up to expose userspace bits
2008-12-22 11:01:35 -08:00
caac73b67d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 11:39:34 -08:00
0b5b1b5cc0
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-18 11:39:29 -08:00
60b7c664e0
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 11:39:15 -08:00
8b46ed9359
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 11:39:14 -08:00
944fd8ad8c
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-18 11:39:07 -08:00
bf57b913fb
Revert commit_cb feature
2008-12-18 11:39:02 -08:00
e43153f247
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-18 11:38:15 -08:00
612f7c20d1
Revert commit_cb feature
2008-12-18 11:37:08 -08:00
9ae2c70438
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2008-12-18 11:34:25 -08:00
625fac6664
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-18 11:34:24 -08:00
63bf9b60d5
Revert changes from this branch so the branch may be removed. We
...
will integrate the latest patch from Sun here once everything is
is basically working. This verion of the patch is out of date
anyone and may not be what is needed.
2008-12-18 11:31:32 -08:00
52d8216e19
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2008-12-17 12:48:15 -08:00
1a50fc5480
Resolve collision
2008-12-17 12:40:17 -08:00
8cfc6c6ef3
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-17 12:29:38 -08:00
e885dd3a7d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 12:29:14 -08:00
75bd3d3fae
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-17 12:29:06 -08:00
7881d6e148
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-17 12:28:37 -08:00
632a5dc58b
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-17 12:28:36 -08:00
5c220cf49c
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-17 12:28:22 -08:00
42752f2339
Resolve conflict
2008-12-17 12:28:15 -08:00
55b0194547
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-17 12:26:44 -08:00
9129b436bb
Resolve conflict
2008-12-17 12:24:50 -08:00
9ef6211ce7
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 12:23:57 -08:00
b23299c7db
Fix two prototypes in the right place
2008-12-17 12:20:20 -08:00
27ce147510
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-17 12:16:59 -08:00
3278f7b38d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 12:16:26 -08:00
e21155cbdf
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-17 12:16:18 -08:00
c0e4b0cc84
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-17 12:15:49 -08:00
fe7d776569
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-17 12:15:47 -08:00
956a8280a3
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-17 12:15:28 -08:00
895bbc24db
Refresh context
2008-12-17 12:15:21 -08:00
9a10c42b65
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-17 11:52:50 -08:00
126e1d5d92
Resolve conflict
2008-12-17 11:51:43 -08:00
6a509b3bca
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 11:50:41 -08:00
77811f8236
Fix prototype
2008-12-17 11:48:40 -08:00
4ee4891d66
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-16 16:10:16 -08:00
862436f8c9
Strip out userspace interface to mount the FS. I need to talk about the right way to manage these changes with the lustre group at Sun, and see where they stand
2008-12-16 16:06:24 -08:00
305c3fc652
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-12 16:53:09 -08:00
313c01433d
Remove add zfs_i18n dependency
2008-12-12 16:41:22 -08:00
b62b4773d1
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2008-12-11 15:28:31 -08:00
a2d1d32c17
move vdev_disk to it's new home
2008-12-11 15:26:36 -08:00
de2d4da1a4
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-11 11:37:26 -08:00
11e1ce8c2e
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-11 11:36:50 -08:00
028c2e29e9
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-11 11:36:22 -08:00
ef5070a38b
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-11 11:36:17 -08:00
3c0ff259db
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-11 11:36:05 -08:00
5bb8f9ec25
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-11 11:36:00 -08:00
4003bc5b2c
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-11 11:35:48 -08:00
aca9d98817
Fix conflict
2008-12-11 11:34:16 -08:00
e1694cfaec
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-12-11 11:27:18 -08:00
8aad84f781
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-11 11:27:12 -08:00
e152d6e601
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-11 11:27:10 -08:00
756a122d37
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-11 11:25:42 -08:00
8f8ac4288f
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2008-12-11 11:25:09 -08:00
4f5d567cfd
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-11 11:24:45 -08:00
172bb4bd5e
Move the world out of /zfs/ and seperate out module build tree
2008-12-11 11:08:09 -08:00
Brian Behlendorf
Ricardo M. Correia