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
a85dce5add
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-19 21:30:46 -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
4ed190513e
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-19 21:08:51 -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
a2a33f17e4
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-19 15:30:50 -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
b313904c89
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-19 15:08:39 -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
c72f5112d3
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-16 16:20:45 -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
df985d53db
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-16 16:17:57 -07:00
f86b52a39d
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-16 16:17:55 -07:00
3eebe1bd0e
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-03-16 16:17:54 -07:00
3eb4ba3ebd
Add 3 more uninit errors detected by gcc 3.4.0 compiler.
2009-03-16 16:06:50 -07:00
709c447ce6
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-16 11:41:18 -07:00
7bca8f1926
Use vmem_size() only on i386 systems and in the kernel.
2009-03-16 11:27:26 -07:00
b289a33e68
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-13 11:01:27 -07:00
abfd24f708
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-13 11:00:47 -07:00
a4f8aecbe8
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-13 10:59:53 -07:00
ab636c01ec
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-13 10:59:42 -07:00
344e59a582
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-13 10:59:32 -07:00
b60dd0bdd7
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-13 10:59:31 -07:00
f21bd57c48
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-13 10:59:15 -07:00
adf984639d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-13 10:59:14 -07:00
d7f60ff869
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-13 10:57:50 -07:00
648bbdebbe
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-13 10:57:47 -07:00
486df2d11d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-13 10:57:46 -07:00
36c46c6031
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-13 10:57:45 -07:00
d2910d2415
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-03-13 10:57:43 -07:00
c98996ded8
Explicitly cast to prevent 'void *' dereference.
2009-03-13 10:51:11 -07:00
d032066bf3
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-03-12 10:51:22 -07:00
b625eab814
Move upcall after run_args are initialized.
2009-03-12 10:46:54 -07:00
bb06faa046
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-12 10:40:54 -07:00
58e63ca4cc
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-12 10:40:17 -07:00
71188348b0
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-12 10:39:26 -07:00
e0b048a823
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-12 10:39:17 -07:00
8206ed9aea
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-12 10:39:00 -07:00
4d0f64844d
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-12 10:38:59 -07:00
5303323f3a
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-12 10:38:45 -07:00
2ff032fd60
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-12 10:38:44 -07:00
9bdbd7c8f7
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 10:37:18 -07:00
c8368a8daa
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-12 10:37:15 -07:00
b9b399bf04
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 10:37:14 -07:00
a03187bb3b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 10:37:12 -07:00
f8fe8a76f4
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-03-12 10:37:11 -07:00
cabd4a69c4
Resolve remaining uninitialized variables
...
Most of these fixes appear to be harmless and should never occur.
However, there were a few cases in this patch which do concern me,
I doubt we're seeing them but they look possible... mainly in the
user tools.
2009-03-12 10:30:41 -07:00
a59f378c54
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-12 10:03:31 -07:00
308903afa4
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-12 10:02:53 -07:00
0c2f0dd6be
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-12 10:02:05 -07:00
2a002fd082
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-12 10:01:56 -07:00
7605051f07
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-12 10:01:43 -07:00
a4b92c0710
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-12 10:01:41 -07:00
cebf08458e
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-12 10:01:27 -07:00
165b2611d2
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-12 10:01:25 -07:00
0cdc14e427
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 10:00:07 -07:00
a459fe3e3f
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-12 10:00:05 -07:00
dd30dba016
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 10:00:04 -07:00
193ea156e9
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 10:00:03 -07:00
eceaf813ad
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-03-12 10:00:01 -07:00
f2d72af596
Add remaining missing cases (or a default) to all switch statements.
...
The previous code was not wrong, but this prevents gcc from warning
us about missing cases for these known safe switch statements. The
-Wno-missing-cases can now be removed to detect places where we
accidentally forgot a case.
2009-03-12 09:53:08 -07:00
0d19b2613b
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-03-11 22:50:31 -07:00
7dda95296c
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-11 22:50:29 -07:00
ef003a41c3
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 22:50:02 -07:00
7ffff81846
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-11 22:49:26 -07:00
08a409f648
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-11 22:49:17 -07:00
ec7bd3f401
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-11 22:49:10 -07:00
882ac1e50f
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-11 22:49:09 -07:00
f9494814c2
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-11 22:48:56 -07:00
dadb99c29a
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-11 22:48:55 -07:00
901d2a8d13
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-11 22:47:58 -07:00
1b9605212b
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-11 22:47:56 -07:00
909582a95e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 22:47:56 -07:00
6211d1a370
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 22:47:54 -07:00
a2dc88da2a
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-03-11 22:47:53 -07:00
1c0279a08f
Resolve newly revealed unused vars and symbols caused by topic branch.
2009-03-11 22:43:09 -07:00
462f864365
Check should be in ASSERT to minimize stack and prevent unused var.
2009-03-11 22:38:16 -07:00
6315decd17
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-11 22:30:26 -07:00
01c24c3a86
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 22:29:57 -07:00
adcaad04be
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-03-11 22:29:12 -07:00
bc61ef667f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-11 22:29:09 -07:00
c57d3bce5c
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-11 22:29:00 -07:00
38e76d0b22
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-11 22:28:48 -07:00
e5c0a2a2f7
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-11 22:28:47 -07:00
0dcd576c67
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-11 22:28:33 -07:00
cb75043186
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-11 22:28:31 -07:00
24e488aa55
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-11 22:27:18 -07:00
e6941c57fe
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-11 22:27:16 -07:00
e625efa701
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 22:27:15 -07:00
c9daa4fbd2
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 22:27:14 -07:00
246cae3509
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-03-11 22:27:11 -07:00
25c88fda18
Remove unused variable
2009-03-11 22:15:36 -07:00
ecd2dbcb44
Resolve upstream unused variables so we can remove the -Wno-unused
...
compile option. In most case the variables are only unused when
debugging is disabled (ASSERT) however they do waste stack if that
case if the compiler doesn't optimize it out (it should). But more
importantly disabling this warning prevent us from noticing legit
unused variables accidentally left in other place of the code.
2009-03-11 22:07:25 -07:00
cb52b25a43
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-11 21:03:09 -07:00
9326966d34
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 21:02:37 -07:00
b4ab230f6a
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-11 21:01:45 -07:00
8d06511a29
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-11 21:01:35 -07:00
f88492180c
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-11 21:01:22 -07:00
e140466d9c
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-11 21:01:21 -07:00
60a37cc531
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-11 21:01:05 -07:00
b6616bd2c6
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-11 21:01:03 -07:00
c351352990
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-11 20:59:46 -07:00
e0eecbc272
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-11 20:59:45 -07:00
4c042de40b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 20:59:43 -07:00
60ac8152fe
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 20:59:42 -07:00
9915249546
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2009-03-11 20:53:11 -07:00
d4dbc7dca8
Resolve all instances of missing braces.
2009-03-11 20:52:21 -07:00
f6ef07fab5
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-11 16:28:01 -07:00
2b85d248b9
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-11 16:28:00 -07:00
c9323d991b
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-11 16:27:48 -07:00
cfbbf79eeb
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-11 16:27:47 -07:00
8680138968
Add missing EXPORT_SYMBOL() macro.
...
ZFS consumers such as Lustre should have access to these symbols.
2009-03-11 16:22:11 -07:00
f39adcbb54
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
2009-03-11 14:44:59 -07:00
76052e446c
Revert 'linux-have-xdr' topic branch patch.
...
This is not needed anymore since a proper XDR implementation was added
to the SPL as of version spl-0.4.3.
2009-03-11 14:39:10 -07:00
b2041bc8ef
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-11 14:13:33 -07:00
bd92e256e6
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 14:12:52 -07:00
f6fe1c9ee9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-11 14:11:44 -07:00
1d544f4131
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-11 14:11:31 -07:00
94dfc4263d
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-03-11 14:11:18 -07:00
5bc6a80f81
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-11 14:11:04 -07:00
3d59bda174
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-11 14:11:03 -07:00
44bbf3d55a
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-11 14:10:41 -07:00
ab760deda7
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-11 14:10:39 -07:00
5afc3db3ce
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-11 14:08:57 -07:00
9f76497933
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-11 14:08:53 -07:00
1ca6578ebc
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 14:08:51 -07:00
8a3b1a5ff5
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 14:08:50 -07:00
e5011401cd
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-03-11 14:08:48 -07:00
3226eea157
Resolve additional cases where gcc wants extra parenthesis.
...
These were introduced by the rebase to b108.
2009-03-11 13:57:47 -07:00
0479ea4c30
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-11 13:28:01 -07:00
94caad0d1f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 13:27:22 -07:00
0d1f924c2d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-11 13:26:21 -07:00
8c02ea3a49
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-11 13:26:09 -07:00
2510eb0d8b
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-03-11 13:25:57 -07:00
e5aea7e980
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-11 13:25:45 -07:00
6ffd92964e
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-11 13:25:44 -07:00
02159c4359
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-11 13:25:24 -07:00
5915d545e9
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-11 13:25:23 -07:00
2369dcfc6e
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-11 13:23:48 -07:00
edce9778ba
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-11 13:23:46 -07:00
4e945fb768
Remove -Wno-unknown-pragmas compile option, all unknown pragmas
...
have been removed by the gcc-ident-pragmas topic branch.
2009-03-11 13:14:08 -07:00
6869252da7
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-11 12:48:04 -07:00
b56b3ef9b9
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 12:47:26 -07:00
a6faa4a39d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-11 12:46:19 -07:00
8cd67dabe3
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-11 12:46:07 -07:00
292abc5144
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-03-11 12:45:53 -07:00
67bb58519f
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-11 12:45:41 -07:00
aa3c9e30f4
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-11 12:45:39 -07:00
3cfb9e0c7d
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-11 12:45:16 -07:00
9ceea9faf2
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-11 12:45:15 -07:00
8da11058e7
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-11 12:43:34 -07:00
adf52e68be
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-11 12:43:32 -07:00
0cad1eaf40
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 12:43:30 -07:00
86baaa124e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 12:43:29 -07:00
ced9992186
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-03-11 12:43:28 -07:00
fbb2843086
Ensure idx is properly initialized in all instances.
2009-03-11 12:34:24 -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
a55824aa6a
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 11:20:15 -07:00
fbe3b02667
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-11 11:18:54 -07:00
0eca278f8a
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-11 11:18:37 -07:00
3cc7a2814d
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-03-11 11:18:23 -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
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
c143e6e5b9
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-11 11:09:18 -07:00
dff484a388
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 11:09:13 -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
2d756b5ea3
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 10:44:10 -07:00
4f57a6ccb6
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-11 10:43:09 -07:00
a032eaff34
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-11 10:42:57 -07:00
da73d85b15
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-03-11 10:42:43 -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
73c738d1ce
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-11 10:40:37 -07:00
1cb08d7cfc
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-11 10:40:34 -07:00
8eaf19dae8
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 10:40:33 -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
851cd16a32
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-03-10 21:51:06 -07:00
c0c0c27632
Build system and packaging (RPM support) (Part 3)
...
Complete support for dist install srpm and rpm make targets.
2009-03-10 21:45:50 -07:00
89719f5398
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-10 21:42:31 -07:00
7f0ca09791
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-10 21:42:00 -07:00
f48c3c25ea
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-10 21:41:06 -07:00
2d67f609f3
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-10 21:40:56 -07:00
05a46e2f68
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-03-10 21:40:46 -07:00
55dcb5b609
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-10 21:40:37 -07:00
a03a940a3b
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-10 21:40:35 -07:00
5f6f34dbea
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-10 21:40:20 -07:00
952e70b1a0
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-10 21:40:19 -07:00
048d7dcc06
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-10 21:39:03 -07:00
f2499f448a
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-10 21:39:00 -07:00
4911b7be4d
zpios subdir should be on linux-zpios branch
2009-03-10 21:33:24 -07:00
66a5ec0f7b
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-10 21:30:48 -07:00
6bf18caf9f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
...
Conflicts:
module/Makefile.in
2009-03-10 21:29:58 -07:00
be8904440b
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-10 21:28:01 -07:00
370b674e09
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-10 21:27:49 -07:00
f65339a529
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-03-10 21:27:34 -07:00
799aae7107
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-10 21:27:22 -07:00
729130ffaa
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-10 21:27:20 -07:00
e1a4d1e88a
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-10 21:27:01 -07:00
e610bf6e09
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-10 21:26:59 -07:00
36860ec1a8
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
module/Makefile.in
2009-03-10 21:23:17 -07:00
11bcfaa5ef
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-10 21:22:15 -07:00
c8e569dd1c
Build system and packaging (RPM support) (Part 2)
...
Complete support for dist install srpm and rpm make targets.
2009-03-10 21:13:30 -07:00
7eeec4808a
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-20 14:33:26 -08:00
4d28f29b6c
Update profile scripts with additional upcalls for fine grained profiling
2009-02-20 14:28:00 -08:00
43fb0282da
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-19 14:41:00 -08:00
d51fcd107f
Remove useless run_args->regions check which was always true
2009-02-19 14:35:41 -08:00
d3f070026f
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-19 13:02:01 -08:00
23710f1308
Minor zpios cleanup plus addition of --nowait feature
2009-02-19 12:56:50 -08:00
c0fce9bde6
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-02-18 16:40:34 -08:00
a2b17c5744
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-02-18 16:39:57 -08:00
a21e67a4af
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-02-18 16:38:54 -08:00
359141b50e
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-02-18 16:38:40 -08:00
a983057c58
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-02-18 16:38:28 -08:00
2cbe1d0785
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-02-18 16:38:16 -08:00
fab643a25b
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-02-18 16:38:15 -08:00
ac79872526
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-02-18 16:37:56 -08:00
87245deaab
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-02-18 16:37:54 -08:00
04f4045077
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-02-18 16:36:25 -08:00
e898182f62
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-02-18 16:36:21 -08:00
b57a283336
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-02-18 16:36:19 -08:00
d53b9a34ea
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-02-18 16:36:17 -08:00
e6c50e7136
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-02-18 16:36:16 -08:00
a0ef7f5826
C90 fixes int declared in for() is a C99 construct
2009-02-18 16:30:01 -08:00
9f2e9c5a87
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-02-18 16:24:45 -08:00
ccdc0e2d04
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-02-18 16:24:06 -08:00
4df2e94a2d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-02-18 16:23:03 -08:00
de8cca1a9f
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-02-18 16:22:50 -08:00
7f52d6ee41
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-02-18 16:22:36 -08:00
c44051f635
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-02-18 16:22:25 -08:00
9aab96eb9d
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-02-18 16:22:23 -08:00
b976733285
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-02-18 16:22:03 -08:00
b4b7da1314
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-02-18 16:22:02 -08:00
4119aba847
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-02-18 16:20:38 -08:00
c80011c473
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-02-18 16:20:35 -08:00
6c4c486b9e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-02-18 16:20:33 -08:00
c1d525d6e9
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-02-18 16:20:32 -08:00
fd9fdb78c6
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-02-18 16:20:30 -08:00
f07954ef8a
Pass 0's instead of NULL's which are the same but of the correct type
2009-02-18 16:14:20 -08:00
eb3d5e7051
Local try should be in this patch
2009-02-18 14:47:06 -08: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
b3d7657ea0
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-02-18 14:37:01 -08:00
3d4185ed1d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-02-18 14:35:43 -08:00
d9229ad643
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-02-18 14:35:32 -08:00
a278e153c4
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-02-18 14:35:20 -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
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
c893c7cf3d
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-02-18 14:30:56 -08:00
7872d84be6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-02-18 14:30:54 -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
dbc3a5ec55
Merge commit 'refs/top-bases/fix-list' into fix-list
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:29:48 -08:00
7fe1b71533
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-02-18 14:29:19 -08:00
404fd8578f
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2009-02-18 14:28:27 -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
3ac1fca8dc
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-02-18 14:27:31 -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
3eb7fa9afd
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-02-18 14:04:08 -08:00
32d4d74b04
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-02-18 14:04:04 -08:00
Brian Behlendorf
Ricardo M. Correia