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
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
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
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
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
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
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
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
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
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
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
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
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
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
32d4d74b04
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-02-18 14:04:04 -08:00
6fa66816c1
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:03:55 -08:00
5be9e325a1
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:03:22 -08:00
ba528721da
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-02-18 13:12:58 -08:00
0b8e48b813
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-02-18 13:12:53 -08:00
e203e7b48f
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-02-18 13:12:35 -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
3b17164f71
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
module/zfs/vdev.c
module/zfs/zio.c
2009-02-18 13:09:32 -08:00
d164b20935
Rebase master to b108
2009-02-18 12:51:31 -08:00
e47c3be7df
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-02-07 13:12:09 -08:00
4e4327a0a5
Drop the KERNEL portion of this check, just checking __i386 is correct
2009-02-07 13:10:16 -08:00
b52f710397
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-02-06 10:12:34 -08:00
c3ec929baf
Ensure vmem_size() calculations are only used on __i386 or we will
...
missize the arch cache on 64bit machines with the SPL. This change
should probably be there in the Solaris version as well.
2009-02-06 10:09:20 -08:00
895c8b9629
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-02-04 15:21:38 -08:00
770152bd1d
Revert current code removal changes, this support now exists in the SPL. The branch is being left in place because I expect there to be other new changes soon
2009-02-04 15:19:19 -08:00
98674d530a
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-01-26 16:50:32 -08:00
3657ada547
Update linux vdev_disk interfaces to issue multiple bios if needed due to the maximum request size being smaller than the request size passed down from the spa
2009-01-26 16:46:50 -08:00
92dce85827
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-01-21 11:02:12 -08:00
ab8f4ca43f
Convert ASSERT() to VERIFY() for better coverage
2009-01-21 10:59:06 -08:00
ef96542acb
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-15 16:34:51 -08:00
7c8ca1d516
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-15 16:34:13 -08:00
8ff964a4f3
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-15 16:33:09 -08:00
56b47e5767
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-15 16:32:42 -08:00
f1300cddb7
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-15 16:32:30 -08:00
f33c13d11d
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-15 16:32:27 -08:00
c090c8b1aa
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-15 16:32:10 -08:00
41cba9f136
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-15 16:32:08 -08:00
37cc2cedde
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-15 16:30:38 -08:00
b8e5edb299
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-01-15 16:30:32 -08:00
fb256294c9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 16:30:29 -08:00
c5b335f613
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-15 16:30:28 -08:00
31cddc8a0b
Merge branch 'fix-locks' into refs/top-bases/fix-branch
2009-01-15 16:30:25 -08:00
50186c2b57
All init and destroy initialized pulled in
2009-01-15 16:25:25 -08:00
7d4fe54632
txg_init/txg_fini cv_* initialized pulled in upstream in a slightly different way, drop these now redundant versions
2009-01-15 16:22:23 -08:00
38a2cb40de
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-15 15:31:02 -08:00
50a6b919a4
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-15 15:30:46 -08:00
461fe17e5f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-15 15:30:20 -08:00
1724a1dd37
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-15 15:30:10 -08:00
865347e0be
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-15 15:30:05 -08:00
702ba8cdf7
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-15 15:30:04 -08:00
930ef960bc
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-15 15:29:56 -08:00
9c8802c7e4
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-15 15:29:55 -08:00
15cd579536
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-15 15:29:18 -08:00
2e84c7ae79
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-01-15 15:29:16 -08:00
8511545409
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 15:29:15 -08:00
fa36244fba
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-15 15:29:14 -08:00
4c0be07ad9
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-15 15:29:13 -08:00
22284754e0
Resolve C90 int declared in for() construct
2009-01-15 15:26:54 -08:00
d2150abea0
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-15 14:53:57 -08:00
b8709a7d90
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-15 14:53:41 -08:00
41c372fa3f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-15 14:53:14 -08:00
c64f23d8d7
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-15 14:53:02 -08:00
c6412aa523
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-15 14:52:57 -08:00
7c879f3b8b
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-15 14:52:56 -08:00
86b606d846
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-15 14:52:48 -08:00
141235d905
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-15 14:52:47 -08:00
2763e879ec
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-15 14:52:08 -08:00
b7f8d6e829
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-01-15 14:52:06 -08:00
63722ea81a
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:52:04 -08:00
12fb73609c
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-15 14:52:04 -08:00
e23dbee181
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-15 14:52:03 -08:00
b61295bfb6
Resolve C90 int declared in for() construct
2009-01-15 14:49:42 -08:00
435fa44075
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-15 14:40:23 -08:00
6479dc1921
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-15 14:40:07 -08:00
a74bc899dc
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-15 14:39:42 -08:00
21b9ae22f4
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-15 14:39:31 -08:00
dd2e5734f7
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-15 14:39:26 -08:00
4c1ba3d379
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-15 14:39:25 -08:00
3ffbd630ad
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-15 14:39:18 -08:00
1a4ae03863
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-15 14:39:18 -08:00
0f392008db
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-15 14:38:41 -08:00
fe7a703285
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-01-15 14:38:39 -08:00
3b6c91ec9f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:38:38 -08:00
ec41b57eb3
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-15 14:38:38 -08:00
e9c7a643f1
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-15 14:38:37 -08:00
77f365172c
Resolve C90 int declared in for() construct
2009-01-15 14:36:27 -08:00
454835e259
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-15 14:30:55 -08:00
94c2ebf6f0
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-15 14:30:40 -08:00
7dd685ccc3
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-15 14:30:14 -08:00
39688a10b9
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-15 14:30:04 -08:00
574b2c897e
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-15 14:29:58 -08:00
372dba924d
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-15 14:29:58 -08:00
0eeb5ec0f5
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-15 14:29:50 -08:00
ab52989424
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-15 14:29:50 -08:00
b83cf899ca
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-15 14:29:13 -08:00
062f1f78c6
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-01-15 14:29:11 -08:00
cb55f9a832
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:29:11 -08:00
43b4c537eb
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-15 14:29:10 -08:00
f969333c73
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-15 14:29:09 -08:00
c4fc002c87
Resolve C90 int declared in for() construct
2009-01-15 14:26:52 -08:00
adcb983918
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-15 14:22:14 -08:00
de66052064
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-15 14:21:55 -08:00
465b2c795d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-15 14:21:24 -08:00
2c83372734
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-15 14:21:11 -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
1f372d9030
Resolve conflict with removed cleaner type
2009-01-15 14:18:01 -08:00
8684f3ea64
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-01-15 14:16:25 -08:00
ddaad20220
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:16:23 -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
625451acfc
Merge commit 'refs/top-bases/fix-list' into fix-list
2009-01-15 14:16:14 -08:00
089836c3e4
Resolve conflict with removed cleaner type
2009-01-15 14:14:57 -08:00
216ce72418
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2009-01-15 14:13:46 -08:00
551838a6c8
Resolve conflict with removed cleaner type
2009-01-15 14:13:39 -08:00
b633e4f669
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-01-15 14:11:26 -08:00
da7151a89e
Resolve conflict with removed cleaner type
2009-01-15 14:11:19 -08:00
7aa64936aa
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-01-15 14:05:35 -08:00
977fef2ba7
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-01-15 14:05:32 -08:00
2f36bf5af4
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-01-15 14:05:29 -08:00
35a269c06c
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-01-15 14:05:26 -08:00
a2e601c6e3
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-01-15 14:04:39 -08:00
3fa768e21b
Resolve conflict with removed cleaner type
2009-01-15 14:04:35 -08:00
Brian Behlendorf
Ricardo M. Correia