0d6b81fcca
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-13 15:34:00 -08:00
43cd437415
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-01-13 15:33:59 -08:00
94944fab96
Fix proper list node initialization
2009-01-13 15:31:58 -08:00
62d5f771e5
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-13 15:07:45 -08:00
925ed2c7a0
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-13 15:07:44 -08:00
b14513e826
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-13 15:07:08 -08:00
4c31283afc
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-13 15:07:07 -08:00
2e9cd667d0
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2009-01-13 15:07:06 -08:00
fcd2296399
Additional rw_lock not being initialized cleaned in updated code
2009-01-13 15:05:02 -08:00
fd1da7d6b9
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-13 15:02:50 -08:00
042deede25
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-13 15:02:49 -08:00
60f5ac8ac7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-13 15:02:12 -08:00
4a5bd7a3a8
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-13 15:02:11 -08:00
6c96fc31e9
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-01-13 15:02:10 -08:00
bec036636e
List cleanup and use of list_node_init initializer
2009-01-13 15:00:12 -08:00
6ec00152b1
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-13 14:18:51 -08:00
b289f6dd98
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-13 14:18:50 -08:00
bdb0ce1a0d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-13 14:18:11 -08:00
552c9e1abb
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-13 14:18:10 -08:00
c6f1eca44b
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-01-13 14:18:09 -08:00
2ea04834bf
Remove assertion for now
2009-01-13 14:16:11 -08:00
43b31e2884
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-13 13:33:10 -08:00
935c8157f9
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-13 13:33:09 -08:00
f8b66dcc4f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-13 13:32:31 -08:00
8ad629750e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-13 13:32:30 -08:00
bb9b10a830
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-13 13:32:29 -08:00
b73b29ab8e
Fix c90 issue with { }
2009-01-13 13:30:35 -08:00
6c2e910597
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-13 12:32:03 -08:00
5a36a4b40b
Pull in needed hunk from old patch stack for a ZFS build without the ZPL support
2009-01-13 12:28:26 -08:00
58df2601b0
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-09 16:53:49 -08:00
3977cefecc
Update load/unload message, mknod /dev/zfs when udev is unavailable
2009-01-09 16:50:28 -08:00
cd56628b75
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-09 16:41:46 -08:00
7001fd57fa
Register sensible init/fini hooks
2009-01-09 16:38:13 -08:00
b19ccd10af
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-09 16:32:09 -08:00
d9a45283ce
Add ZFS load/unload console messages
2009-01-09 16:28:26 -08:00
ca3acc4f50
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-09 15:52:00 -08:00
1dc5e6d02e
Remove HAVE_SPL should be HAVE_ZPL
2009-01-09 15:50:00 -08:00
764c8c5940
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-09 14:45:45 -08:00
be3a17e437
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-09 14:45:45 -08:00
ff09d64647
Pull all source in to be built, it will be ifdef'ed out as need by higher level topic branches
2009-01-09 14:37:45 -08:00
f4bef22e4e
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-09 14:18:26 -08:00
03a4aefbcf
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-09 14:18:25 -08:00
6b32aaea67
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-09 14:17:49 -08:00
86eb46d20b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-09 14:17:49 -08:00
578c9645df
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-09 14:17:48 -08:00
902ce659b0
Fix c90 compliance issue
2009-01-09 14:15:56 -08:00
8d12e9b274
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-09 13:33:48 -08:00
bc5e2d8660
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-09 13:33:48 -08:00
7a7a074d3d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-09 13:33:11 -08:00
cd5e331e68
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-09 13:33:10 -08:00
953d302b87
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-01-09 13:33:09 -08:00
04638ead67
Change zpool module name to zfs and update references
2009-01-09 13:31:16 -08:00
ca4fc6ef63
Fix cast
2009-01-09 13:29:41 -08:00
68585e71a8
Get correct exit prototype
2009-01-09 13:28:42 -08:00
fb1f1596c7
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-09 12:48:19 -08:00
18f3ecb485
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-09 12:48:17 -08:00
129afe3ce8
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-09 12:46:44 -08:00
b4d27767d8
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-09 12:46:42 -08:00
b3064162aa
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-01-09 12:46:40 -08:00
cb5fc9440b
Remove extra defaults
2009-01-09 12:42:27 -08:00
37cdc79b95
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-09 11:44:34 -08:00
f0f1f7362d
Remove invalid tunable
2009-01-09 11:42:31 -08:00
f612969bdf
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-09 11:31:40 -08:00
dd50143ea1
Add module load/unload entry point hooks and ioctl integration
2009-01-09 11:21:59 -08:00
1a106f9b4e
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-09 09:22:25 -08:00
ed92da1e4e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-09 09:22:24 -08:00
91b9bf3f40
Pulling zvol, zfs_vfsops, and zfs_ioctl to resolve those build issues
2009-01-09 09:19:33 -08:00
cf6efb2639
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-07 15:52:32 -08:00
53a6418874
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-07 15:52:31 -08:00
2a76f03369
Update distfiles
2009-01-07 15:49:36 -08:00
15610133b7
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-06 13:46:03 -08:00
f01d7c3dba
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-06 13:46:02 -08:00
6280843d13
Remove until it can be updated
2009-01-06 13:43:53 -08:00
5f6f39da9a
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-06 13:16:43 -08:00
74bff69746
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-06 13:16:42 -08:00
f9494f2bb1
Build missing sources
2009-01-06 13:14:30 -08:00
63c9f3ff72
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-06 13:01:30 -08:00
57aad95a52
Refresh exported symbols
2009-01-06 12:59:50 -08:00
5bd66364e9
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-06 09:40:24 -08:00
da647d38a3
Refresh exported symbols, remove zio_resume_threads as out of date
2009-01-06 09:38:39 -08:00
82458be35a
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-06 09:30:30 -08:00
bc820e95a6
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-06 09:30:29 -08:00
5f9b0590f5
Remove zfs_fuid for now from kernel source until needed by ZPL
2009-01-06 09:28:09 -08:00
a9361a459e
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-06 09:16:10 -08:00
d71643eb94
Refresh exported symbols
2009-01-06 09:14:10 -08:00
bb6a56e778
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-06 09:03:39 -08:00
1c496f0235
Refresh exported spa_config symbols
2009-01-06 08:59:36 -08:00
e7f04030d2
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-05 16:59:02 -08:00
90ff526841
Remove symbol exports no longer needed with the dsl scrub rewrite
2009-01-05 16:55:15 -08:00
a4d96d5c16
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-05 16:39:28 -08:00
d763974558
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-05 16:39:26 -08:00
9d4d588938
Comment out until ZPL implemented
2009-01-05 16:34:01 -08:00
995a374126
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-05 16:00:32 -08:00
76d40e2e81
Update exported symbols
2009-01-05 15:58:50 -08:00
dbc3840c65
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-05 15:45:06 -08:00
b2db87f254
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-05 15:45:05 -08:00
760d78b9f8
Move default include paths after custom include paths so local stuff gets picked up first
2009-01-05 15:42:56 -08:00
4c741b2f9d
Revert changes and resolve include issue by adjusting include path ordering
2009-01-05 15:40:56 -08:00
ab0b7157d5
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-05 15:21:12 -08:00
eb58273a29
Update exported symbol names for new traversal code
2009-01-05 15:19:35 -08:00
86a7a82c2d
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-05 14:28:34 -08:00
ec462ce48f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-05 14:28:33 -08:00
a4ecacdad7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-05 14:28:00 -08:00
93e72d1102
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-05 14:27:59 -08:00
854fda6d70
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-01-05 14:27:58 -08:00
12ee6d57c8
Avoid using { 0 } assignment because it assume certain things about the condvar and mutex typedefs which may not be true
2009-01-05 14:26:16 -08:00
2ec61316a8
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-05 14:13:48 -08:00
d8f9597730
Always include u8_textprep
2009-01-05 14:12:03 -08:00
90531ed597
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-05 13:59:03 -08:00
0c9de0c356
Linux kernel modularize unicode
2009-01-05 13:57:26 -08:00
1dd185c19d
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-05 12:40:26 -08:00
9c2bf69ecb
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-05 12:40:25 -08:00
ce7115b807
Add unicode makefile references and support
2009-01-05 12:33:09 -08:00
ced77c2f1b
Add unicode makefile references and support
2009-01-05 12:32:55 -08:00
c7907319d9
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-05 12:10:40 -08:00
1c1ec8cce6
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-05 12:10:37 -08:00
07c6176130
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-05 12:09:06 -08:00
52bc9eee2b
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-01-05 12:09:00 -08:00
c239bd53d2
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-01-05 12:08:46 -08:00
65520ad8fd
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2009-01-05 12:08:36 -08:00
1bee6d83ae
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2009-01-05 12:08:23 -08:00
674ed5bd02
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2009-01-05 12:08:18 -08:00
91daa17079
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-01-05 12:08:16 -08:00
39b3a6a12d
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-05 12:08:11 -08:00
358ebaae5a
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-01-05 12:08:02 -08:00
a22f3a712d
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-01-05 12:07:58 -08:00
a55b0f2c1b
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-01-05 12:07:53 -08:00
d09ef994e7
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-01-05 12:07:48 -08:00
5a7a00f67c
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-01-05 12:07:30 -08:00
7d4ccef58f
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-05 12:07:27 -08:00
cdfd10ba79
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-01-05 12:07:25 -08:00
42bcb36c89
Add unicode library
2009-01-05 12:03:23 -08:00
8d0db59e56
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-23 13:49:47 -08:00
39953e7eb3
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-23 13:49:47 -08:00
de6b729e33
Add Makefile tweak
2008-12-23 13:44:15 -08:00
57048fa6fa
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-23 13:13:30 -08:00
f49886c003
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-23 13:13:29 -08:00
7725fe7431
Remove CPU_SEQID from context, available in SPL. Additionally add module magic for zcommon
2008-12-23 13:11:03 -08:00
e7e0111a7c
Update makefile
2008-12-23 13:07:27 -08:00
1d4f536ffd
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-23 12:50:59 -08:00
c22ff325ce
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-23 12:50:58 -08:00
0dfd5ebee8
module/zcommon/Makefile.in
2008-12-23 12:47:03 -08:00
ce950dd29f
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-23 11:49:59 -08:00
82cd3659a2
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-23 11:49:58 -08:00
5a0a9cc451
Update makefiles
2008-12-23 11:47:33 -08:00
ca2b6db925
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-22 13:51:58 -08:00
1f72057409
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-22 13:51:57 -08:00
90e5216ea9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 13:51:17 -08:00
3b93dc4d82
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-22 13:51:14 -08:00
3a953fa870
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2008-12-22 13:51:13 -08:00
d684390d3a
Just fix a bogus return type
2008-12-22 13:49:15 -08:00
3cdde7ffd9
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-22 13:34:59 -08:00
46badfb03b
Only allow this for the kernel
2008-12-22 13:33:06 -08:00
f9e9bba2a4
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-22 11:41:28 -08:00
187be3051e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-22 11:41:27 -08:00
7047bb0678
Add missing files from Makefile.am
2008-12-22 11:36:48 -08:00
22f583b0f5
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-22 11:08:17 -08:00
09de417e20
Move #endif up to expose userspace bits
2008-12-22 11:01:35 -08:00
6a981c09a5
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-22 10:36:49 -08:00
bdbd91fe46
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-22 10:36:48 -08:00
10911f9d71
Add missing sources
2008-12-22 10:27:41 -08:00
f677f67130
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-19 16:34:12 -08:00
cbc70456f1
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 16:34:10 -08:00
96813619bf
Pull in new background scrubber
2008-12-19 16:29:13 -08:00
36f6317537
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-19 13:47:54 -08:00
5cd3d5fe3f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 13:47:53 -08:00
1b2a1a31bb
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 13:47:20 -08:00
b5e4bf3731
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 13:47:19 -08:00
8161b781a1
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 13:47:18 -08:00
89bd2100e7
Resolve a few more c90 issues
2008-12-19 13:45:24 -08:00
2b99cc1a0d
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-19 12:38:27 -08:00
5f5a7707b5
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 12:38:25 -08:00
97818e5e2b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 12:37:17 -08:00
459f1388ba
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 12:37:15 -08:00
87810a7c8b
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 12:37:13 -08:00
93a6c0b0b9
Fix c90 for() issue
2008-12-19 12:33:22 -08:00
f39f71b60c
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-19 11:06:26 -08:00
e5a6ed971b
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 11:06:25 -08:00
cc92d6497b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 11:05:49 -08:00
d67cf69e08
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 11:05:49 -08:00
893a49fa9a
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 11:05:48 -08:00
9041f66bad
Fix all instances of for (int i;;) {} that were easily found
2008-12-19 11:03:54 -08:00
870c514108
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-19 10:50:43 -08:00
4f5a560334
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 10:50:42 -08:00
1db27e736e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 10:50:09 -08:00
ead0ea6da5
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 10:50:09 -08:00
d9b08ad01f
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 10:50:08 -08:00
66e0d59024
Whoops, add missing j
2008-12-19 10:48:11 -08:00
afacc36f29
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-19 10:37:07 -08:00
01f8dc1f20
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 10:37:06 -08:00
76247cc21d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 10:36:34 -08:00
800463b2ef
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 10:36:33 -08:00
7e159c86a3
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 10:36:32 -08:00
294ebb7537
Fix C90 for(int i;;;) compliance issues
2008-12-19 10:34:41 -08:00
9a9a66d507
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-19 10:26:51 -08:00
f1ba2464f9
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-19 10:26:50 -08:00
e3815b6d3f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 10:26:18 -08:00
e312737766
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 10:26:18 -08:00
b66929fe90
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-19 10:26:17 -08:00
5ee6377759
Fix missing void in prototype
2008-12-19 10:24:26 -08:00
1bf7e13e78
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-18 13:53:00 -08:00
ef0739a21d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 13:52:59 -08:00
433b5c8023
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 13:52:17 -08:00
93bc33a39e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 13:52:16 -08:00
23e30eeec9
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 13:52:15 -08:00
6cccf01d35
Missed needed drc var
2008-12-18 13:50:12 -08:00
bc05eda218
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-18 13:43:59 -08:00
07901e75cc
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 13:43:58 -08:00
bab7f42832
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 13:43:20 -08:00
5ce7826ab4
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 13:43:19 -08:00
732fe6a75f
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 13:43:19 -08:00
973a9d5a79
Resolve drr shadow by breaking hunk in to a new function, which is just cleaner anyway
2008-12-18 13:41:21 -08:00
6ef7594e64
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-18 13:27:15 -08:00
fea7eb9fe4
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 13:27:14 -08:00
1a6091791d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 13:26:36 -08:00
8f52e45adf
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 13:26:35 -08:00
8eccbd95b9
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 13:26:34 -08:00
163f096cb6
Resolve remove shadow, rename to rm
2008-12-18 13:24:37 -08:00
5242f45431
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-18 11:52:04 -08:00
5c0f0ca54f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 11:52:03 -08:00
4be8cdca38
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 11:51:24 -08:00
cf4b3895f1
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 11:51:23 -08:00
458a2444c2
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 11:51:22 -08:00
d957a6c66f
Resolve dnp shadow conflict
2008-12-18 11:49:22 -08:00
944fd8ad8c
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-18 11:39:07 -08:00
bf57b913fb
Revert commit_cb feature
2008-12-18 11:39:02 -08:00
58645698b4
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 11:34:26 -08:00
9ae2c70438
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2008-12-18 11:34:25 -08:00
625fac6664
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-18 11:34:24 -08:00
63bf9b60d5
Revert changes from this branch so the branch may be removed. We
...
will integrate the latest patch from Sun here once everything is
is basically working. This verion of the patch is out of date
anyone and may not be what is needed.
2008-12-18 11:31:32 -08:00
5598664343
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-18 11:25:21 -08:00
139baeef7c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 11:25:20 -08:00
2ef6ae9654
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 11:24:42 -08:00
d431498139
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 11:24:41 -08:00
22f122e505
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 11:24:40 -08:00
50b70a0c9a
Resolve time conflict
2008-12-18 11:22:39 -08:00
819921a351
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-18 10:06:39 -08:00
cf126a8e16
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 10:06:38 -08:00
5c7ee1347b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 10:06:01 -08:00
012ce813df
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2008-12-18 10:06:00 -08:00
e4d1734eb1
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-18 10:05:59 -08:00
432399da0f
Add dropping written variable declaration
2008-12-18 10:03:57 -08:00
00cab20dfb
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-18 09:05:58 -08:00
1e70a9b85c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-18 09:05:57 -08:00
6b7c775e09
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 09:05:11 -08:00
06c9438f79
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 09:05:10 -08:00
cfc42cf0ab
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 09:05:09 -08:00
0392342e3d
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-18 09:05:08 -08:00
c37308fc20
Resolve stat conflict with stat()
2008-12-18 09:03:02 -08:00
d1684019b4
Move int out of for construct for c90 compliance
2008-12-18 09:01:48 -08:00
Brian Behlendorf