b6cf87b32d
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-07 16:30:58 -07:00
0a00d10c24
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-07 16:30:57 -07:00
02362668ac
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-07 16:30:56 -07:00
24daf7747f
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-07-07 16:30:54 -07:00
0e310d30de
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-07-07 16:30:54 -07:00
10dcf485d3
First fit allocator unused comment it out.
2009-07-07 16:23:09 -07:00
ebda366c1c
Add missing case introduced by rebase.
2009-07-07 16:22:33 -07:00
83bdfba9ad
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-07 16:13:12 -07:00
82ad66258e
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-07 16:11:37 -07:00
3977001d03
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-07 16:11:12 -07:00
80528a7792
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-07 16:11:11 -07:00
f6880f590e
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-07 16:10:52 -07:00
77e4a2039c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-07 16:10:51 -07:00
e122a47cd8
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-07 16:09:19 -07:00
b8af4a2181
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-07 16:09:16 -07:00
c460e5edb0
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-07 16:09:15 -07:00
04a83f2337
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-07 16:09:13 -07:00
55b864f19b
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-07-07 16:09:12 -07:00
f80f59f955
Add missing paranthesis for gcc.
2009-07-07 16:01:13 -07:00
09184991f6
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-07 15:54:35 -07:00
21fa8cfb5d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-07 15:52:48 -07:00
8e84e9205f
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-07 15:52:22 -07:00
1cf1fc91a1
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-07 15:52:21 -07:00
71a479fb53
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-07 15:51:59 -07:00
91316b77b9
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-07 15:51:57 -07:00
795d799358
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-07 15:50:19 -07:00
4abc33bbe4
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-07 15:50:16 -07:00
e5c8fcd6b0
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-07 15:50:14 -07:00
c75167c985
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-07 15:50:13 -07:00
07a6b68575
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-07-07 15:50:11 -07:00
7373ddf55f
hash_lock should always be initialized
2009-07-07 15:41:19 -07:00
20989cd4f2
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-07-06 17:01:43 -07:00
e49bdb470e
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-07-06 17:01:42 -07:00
169b3085db
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
...
Conflicts:
module/zfs/dmu.c
2009-07-06 17:01:30 -07:00
621679fec6
Update to use dmu_read() instead of dmu_read_impl() now that a 'flags'
...
argument is available. This flags argument was added to allow a clean
API for disabling prefetch, so I'll update zpios to use it in preference
to the module option hack used before.
2009-07-06 16:51:59 -07:00
1175906fbc
Update zerocopy patch to be consistent with new flags arg
...
passed to dmu_read(). It would be nice to have one of these
for dmu_write() as well but we have do without for now.
2009-07-06 16:01:41 -07:00
07a56371aa
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
...
Conflicts:
module/zfs/zfs_vfsops.c
2009-07-06 15:17:38 -07:00
a6b1465e30
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
...
Conflicts:
module/zfs/include/sys/zfs_fuid.h
module/zfs/zfs_fuid.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_vfsops.c
module/zfs/zfs_znode.c
2009-07-06 15:16:54 -07:00
d65102b493
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-06 15:08:57 -07:00
f48b799f78
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-06 15:03:09 -07:00
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
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
4fa3570131
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-06 13:47:16 -07:00
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
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
e3d05c97eb
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-06 13:17:32 -07:00
658459249e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-06 13:17:28 -07:00
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
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
c66757e332
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/fletcher.c
2009-07-02 17:07:06 -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
9550da2ba6
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
...
Conflicts:
module/zfs/arc.c
module/zfs/zio.c
2009-07-02 16:58:33 -07:00
44703f0029
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/arc.c
module/zfs/spa.c
2009-07-02 16:57:09 -07:00
eb0137f395
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/arc.c
module/zfs/dmu_objset.c
module/zfs/dsl_pool.c
module/zfs/spa.c
module/zfs/zfs_ioctl.c
2009-07-02 16:55:22 -07:00
a5a71d128d
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/spa.c
2009-07-02 16:52:07 -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
e9f14862a5
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
module/zfs/dmu_objset.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/vdev_label.c
module/zfs/zio.c
2009-07-02 16:18:03 -07:00
9babb37438
Rebase master to b117
2009-07-02 15:44:48 -07:00
df388bfc0a
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-01 11:11:48 -07:00
94390a0793
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-01 11:11:27 -07:00
3c96976b99
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-01 11:10:51 -07:00
bfa8b02c2c
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-01 11:10:37 -07:00
d4721058bc
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-01 11:10:36 -07:00
a37fb966bd
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-01 11:10:25 -07:00
8c684c8d85
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-01 11:10:24 -07:00
b44445a8f1
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-01 11:09:33 -07:00
fa91b5d59b
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-01 11:09:31 -07:00
ef0a712858
Distro friendly build system / packaging improvements.
...
These changes bring the zfs-0.4.4 tree in to compliance with
the spl-0.4.4 packaging changes. The bottom line is 2 source
rpms and 4 binary rpms will now be generated when creating
packages there will be:
zfs-<version>.src.rpm
- Fully rebuildable source rpm for libzfs and utils.
zfs-modules-<version>.src.rpm
- Fully rebuildable source rpm for kernel modules.
zfs-<version>.<arch>.rpm
- Binary rpm for libzfs and utils. The utils in this package are
compatible with all zfs-module rpms of the same version.
zfs-devel-<version>.<arch>.rpm
- Binary rpm containing headers for building against libzfs libraries.
zfs-modules-<verion>-<kernel>.arch.rpm
- Binary rpm containing the kernel modules for a specific kernel build.
The package name contains the kernel version and you should have one
of these packages installed to match every kernel on your system.
zfs-modules-devel-<verion>-<kernel>.arch.rpm
- Binary rpm containing development header and module symbols needed
for building additional kernel modules which are dependent on the
zfs module stack.
Expect minor interations on these changes as I validate they work
properly on CHAOS, RHEL, Fedora, and SLES style distros.
2009-07-01 10:53:05 -07:00
26bea36f61
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-06-08 13:24:19 -07:00
2968e197aa
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-06-08 13:24:17 -07:00
737a6ba81a
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-06-08 13:23:40 -07:00
041457706f
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-06-08 13:23:35 -07:00
96da8b0db7
Add missing EXPORT_SYMBOL() to dmu_tx_callback_register().
2009-06-08 13:08:14 -07:00
cc5ce72296
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-20 13:26:38 -07:00
f47473638b
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-20 13:26:36 -07:00
9806b5c02b
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-20 13:26:18 -07:00
6bf1e782f4
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-20 13:26:16 -07:00
9bee47e648
Export additional txg_* symbols.
2009-03-20 13:17:23 -07:00
f764039e87
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-19 21:32:26 -07:00
aee87a5ab6
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-19 21:31:54 -07:00
4298933698
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-19 21:30:56 -07:00
8c8e10d491
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-19 21:30:35 -07:00
18569f4b9e
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-19 21:30:34 -07:00
cc0a015671
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-19 21:30:17 -07:00
61914d7403
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-19 21:30:15 -07:00
56d18263ed
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-19 21:28:54 -07:00
0ebc97288a
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-19 21:28:52 -07:00
bd1685ee4e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 21:28:51 -07:00
1769e10f17
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-03-19 21:28:50 -07:00
6d883d7d40
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-03-19 21:28:48 -07:00
fed604c844
Add extra () requested by gcc
2009-03-19 21:18:54 -07:00
4f2dfa3c94
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-19 21:13:11 -07:00
665c272091
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-19 21:11:35 -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
00d8d21f51
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-19 21:06:15 -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
e7f02d3b41
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 20:59:33 -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
d7243f7729
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-19 15:31:32 -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
7e8fa40f4d
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-19 15:29:38 -07:00
aa729c745c
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-19 15:29:36 -07:00
db3436fafe
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 15:29:35 -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
70c010a7ac
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-19 15:09:47 -07:00
c495a4bd1f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-19 15:09:24 -07:00
8b0f4fa45c
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-19 15:08:46 -07:00
f36defdaa7
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-19 15:08:31 -07:00
0b74b5ae59
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-19 15:08:30 -07:00
099dd7e175
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-19 15:08:18 -07:00
fd3db92fe7
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-19 15:08:17 -07:00
8cdd340206
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-19 15:07:21 -07:00
fac4873ad7
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-19 15:07:19 -07:00
90bbbd109b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 15:07:19 -07:00
f07d61a8c1
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-19 15:07:18 -07:00
cc032b6337
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-03-19 15:07:16 -07:00
9bbf8f1761
Resolve conflict with fix-dnode-cons
2009-03-19 15:02:05 -07:00
1c925dc4ce
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-03-17 16:33:47 -07:00
02424a268b
Use spl_device_* macro's for portability.
2009-03-17 16:27:57 -07:00
015c4a4deb
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-17 16:07:02 -07:00
1f84b8ed2c
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-17 16:07:01 -07:00
f8cd6b6b49
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-17 16:06:51 -07:00
80e98bb0f5
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-17 16:06:50 -07:00
a9b0088f48
Use include missing zfs_config.h and use ZFS_META_VERSION (not VERSION)
2009-03-17 16:02:09 -07:00
a0155baaa9
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-03-17 15:25:57 -07:00
23c544c884
Add zfs_config.h include for HAVE_2ARGS_BIO_END_IO_T define
2009-03-17 15:14:02 -07:00
da843563aa
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-16 16:23:03 -07:00
563c0614c4
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-16 16:22:19 -07:00
4bcfe17f4d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-16 16:21:00 -07:00
f7087f0431
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-16 16:20:30 -07:00
f073f197bc
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-16 16:20:29 -07:00
7ca5472963
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-16 16:20:03 -07:00
5edabb999f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-16 16:20:02 -07:00
f28a31a09a
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-16 16:18:01 -07:00
61926abf0f
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-16 16:17:58 -07:00
Brian Behlendorf