01a745ee24
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-19 11:07:14 -08:00
a8e7c21ad7
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 11:06:51 -08:00
b2bf7106ed
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-19 11:06:46 -08:00
eeccfec33b
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-19 11:06:42 -08:00
8de27ace20
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 11:06:38 -08:00
d5b0e2f5f8
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-19 11:06:33 -08:00
f9e908db67
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-19 11:06:32 -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
e461d277b9
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-19 11:05:52 -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
70a97750bc
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-19 10:51:30 -08:00
0938ee26f9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 10:51:08 -08:00
de6a384c50
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-19 10:51:05 -08:00
525a682d4d
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-19 10:51:03 -08:00
91523abfb0
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-19 10:50:59 -08:00
f35afdefda
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 10:50:54 -08:00
38712a11db
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-19 10:50:50 -08:00
25585a1884
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-19 10:50:49 -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
d5eedbcd00
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-19 10:50:11 -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
3f0ec06d17
Remove chunk from spa_import_common, readd
2008-12-19 10:45:59 -08:00
3d7c44a3de
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-19 10:37:52 -08:00
023d652154
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 10:37:31 -08:00
380a9bcd88
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-19 10:37:26 -08:00
32d62a53f4
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-19 10:37:22 -08:00
b390664792
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 10:37:18 -08:00
7532b57352
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-19 10:37:14 -08:00
fd01bfe6b1
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-19 10:37:13 -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
b6865ac44a
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-19 10:36:36 -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
eeb4e47031
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-19 10:27:35 -08:00
27f8780a37
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 10:27:14 -08:00
9cccccce7c
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-19 10:27:10 -08:00
6fedd6ca38
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-19 10:27:06 -08:00
434356f979
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-19 10:27:02 -08:00
8985e2430d
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-19 10:26:57 -08:00
4ee870c380
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-19 10:26:57 -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
a5e6632531
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-19 10:26:20 -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
0a9ad44fff
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-18 13:53:57 -08:00
63f8023d96
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 13:53:30 -08:00
e8815843b4
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-18 13:53:25 -08:00
41aaf052de
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-18 13:53:19 -08:00
4b7319cd19
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 13:53:14 -08:00
f4f6b1f529
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 13:53:09 -08:00
ecb1da0ac8
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 13:53:08 -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
22a4ca8484
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-18 13:52:21 -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
2f10910f57
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-18 13:44:51 -08:00
5200db236f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 13:44:26 -08:00
c20b05ba8f
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-18 13:44:21 -08:00
97e1edd90d
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-18 13:44:16 -08:00
2543240d85
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 13:44:11 -08:00
c513e66884
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 13:44:06 -08:00
360d4841e7
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 13:44:05 -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
bbd1cc6feb
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-18 13:43:23 -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
9778e475c5
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-18 13:28:07 -08:00
651f0337c4
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 13:27:42 -08:00
7c56a7d623
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-18 13:27:37 -08:00
83b052205b
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-18 13:27:32 -08:00
3ed3a6d46e
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 13:27:27 -08:00
a3cbac5278
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 13:27:23 -08:00
a0ba5c46c1
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 13:27:22 -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
83e1d2bdbc
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-18 13:26:39 -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
60cb2a1fd5
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-18 11:52:58 -08:00
b7bc2d2d19
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 11:52:32 -08:00
88e5d1800e
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-18 11:52:27 -08:00
2bccb1031a
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-18 11:52:22 -08:00
8531efbaf7
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 11:52:17 -08:00
f94274b339
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 11:52:12 -08:00
ec6250d9eb
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 11:52:11 -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
85d3241806
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-18 11:51:27 -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
2c348839b6
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-18 11:40:26 -08:00
caac73b67d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 11:39:34 -08:00
0b5b1b5cc0
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-18 11:39:29 -08:00
7b836ab418
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-18 11:39:24 -08:00
f63ea3c521
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 11:39:20 -08:00
60b7c664e0
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 11:39:15 -08:00
8b46ed9359
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 11:39:14 -08:00
944fd8ad8c
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-18 11:39:07 -08:00
bf57b913fb
Revert commit_cb feature
2008-12-18 11:39:02 -08:00
612f7c20d1
Revert commit_cb feature
2008-12-18 11:37:08 -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
0ab2957537
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-18 11:26:17 -08:00
bf5db00d71
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 11:25:49 -08:00
59ef7e8a19
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-18 11:25:43 -08:00
cd437110ea
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-18 11:25:38 -08:00
c3a0bf49a1
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 11:25:33 -08:00
1321f5a556
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 11:25:28 -08:00
62618f9e3f
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 11:25:28 -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
3eb408d18e
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-18 11:24:45 -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
058af4d43a
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-18 10:07:30 -08:00
b2c4e56a4f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 10:07:06 -08:00
2ea3f11b9e
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-18 10:07:01 -08:00
d4787b52b6
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-18 10:06:56 -08:00
63249028a8
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 10:06:52 -08:00
88ad31655c
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 10:06:47 -08:00
57d4abfe7a
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 10:06:46 -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
075674f079
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-18 10:06:04 -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
9c416cd47f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-18 09:06:49 -08:00
e7d8dc3064
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 09:06:25 -08:00
a8a380dfa5
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-18 09:06:20 -08:00
4ecf6686d0
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-18 09:06:15 -08:00
391f9000dc
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-18 09:06:10 -08:00
bce797040c
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-18 09:06:06 -08:00
8a75774b10
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-18 09:06:05 -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
31f641ff43
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-18 09:05:21 -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
adf685a7bd
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-17 17:04:18 -08:00
585fd3e1e9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 17:03:33 -08:00
a2cbba5d19
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-17 17:03:24 -08:00
b92fd0664c
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-17 17:03:13 -08:00
093c1bbe0e
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-17 17:03:03 -08:00
62d4525a1c
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-17 17:02:53 -08:00
b311e10c5c
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-17 17:02:51 -08:00
4b94ff958a
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-17 17:02:36 -08:00
511af80b44
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-17 17:02:34 -08:00
93e36c1f27
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-17 17:01:22 -08:00
53e66eef5a
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 17:01:14 -08:00
6e26929ddf
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 17:01:12 -08:00
420137d529
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 17:01:09 -08:00
194244b80b
Resolve read shadow conflict
2008-12-17 16:57:21 -08:00
5efd2c3d79
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-17 13:12:04 -08:00
9e0a99fda9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 13:11:41 -08:00
b7e43a8744
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-17 13:11:37 -08:00
e812a28bd8
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-17 13:11:32 -08:00
a7e966d1ce
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-17 13:11:27 -08:00
78fb6dc35b
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-17 13:11:23 -08:00
9016cb7c5c
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-17 13:11:22 -08:00
2b359b1561
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-17 13:11:16 -08:00
c326f72cdc
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-17 13:11:15 -08:00
62568c369a
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-17 13:10:42 -08:00
07411c1f84
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 13:10:39 -08:00
6ab9c098f1
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 13:10:39 -08:00
9842c708fa
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 13:10:38 -08:00
1e3aeaaef1
Resolve shadow conflict
2008-12-17 13:08:39 -08:00
770e9b1ac0
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-17 13:05:23 -08:00
d621c591c9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 13:05:00 -08:00
3075584a49
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-17 13:04:55 -08:00
5375497fcb
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-17 13:04:50 -08:00
cd59687a57
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-17 13:04:46 -08:00
399053dbb0
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-17 13:04:42 -08:00
d4310f718b
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-17 13:04:41 -08:00
8c24ceb793
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-17 13:04:34 -08:00
56005b13e1
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-17 13:04:33 -08:00
b62245fc80
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-17 13:04:00 -08:00
b5740d86cf
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 13:03:57 -08:00
b9fe30002e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 13:03:57 -08:00
e41d37c49d
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 13:03:56 -08:00
fafeacb53f
Resolve shadow conflict
2008-12-17 13:01:56 -08:00
ee81d0b874
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-17 12:48:28 -08:00
52d8216e19
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2008-12-17 12:48:15 -08:00
f802338b3c
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-17 12:48:12 -08:00
ad58c411bc
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 12:47:47 -08:00
12129fde0e
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-17 12:47:37 -08:00
d2ce2661bb
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-17 12:47:27 -08:00
4ca4b6567c
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-17 12:47:20 -08:00
945cf1f5db
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-17 12:47:12 -08:00
65a8241291
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-17 12:47:11 -08:00
e56be59f06
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-17 12:46:59 -08:00
137b3bb57d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-17 12:46:57 -08:00
1153d7e9da
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-17 12:45:58 -08:00
863ec76ff7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 12:45:53 -08:00
941e464645
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 12:45:52 -08:00
a1b865abee
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 12:45:51 -08:00
da718dd80a
Resolve shadow conflict
2008-12-17 12:42:17 -08:00
1a50fc5480
Resolve collision
2008-12-17 12:40:17 -08:00
6e6e04c73c
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-17 12:29:54 -08:00
8cfc6c6ef3
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-17 12:29:38 -08:00
e885dd3a7d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 12:29:14 -08:00
75bd3d3fae
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-17 12:29:06 -08:00
387d87ba54
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-17 12:28:56 -08:00
f430f3f774
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-17 12:28:47 -08:00
7881d6e148
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-17 12:28:37 -08:00
632a5dc58b
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-17 12:28:36 -08:00
5c220cf49c
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-17 12:28:22 -08:00
42752f2339
Resolve conflict
2008-12-17 12:28:15 -08:00
9129b436bb
Resolve conflict
2008-12-17 12:24:50 -08:00
5fa2d90840
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 12:23:59 -08:00
9ef6211ce7
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 12:23:57 -08:00
e2a977c404
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-17 12:23:55 -08:00
b23299c7db
Fix two prototypes in the right place
2008-12-17 12:20:20 -08:00
3ee8ce5cd9
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2008-12-17 12:17:21 -08:00
27ce147510
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-17 12:16:59 -08:00
3278f7b38d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 12:16:26 -08:00
e21155cbdf
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-17 12:16:18 -08:00
e3313b241b
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-17 12:16:08 -08:00
6cfaba6688
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-17 12:15:59 -08:00
c0e4b0cc84
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-17 12:15:49 -08:00
fe7d776569
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-17 12:15:47 -08:00
956a8280a3
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-17 12:15:28 -08:00
895bbc24db
Refresh context
2008-12-17 12:15:21 -08:00
126e1d5d92
Resolve conflict
2008-12-17 11:51:43 -08:00
385d51ad69
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 11:50:42 -08:00
6a509b3bca
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 11:50:41 -08:00
3719c4146d
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-17 11:50:40 -08:00
77811f8236
Fix prototype
2008-12-17 11:48:40 -08:00
4ee4891d66
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-16 16:10:16 -08:00
862436f8c9
Strip out userspace interface to mount the FS. I need to talk about the right way to manage these changes with the lustre group at Sun, and see where they stand
2008-12-16 16:06:24 -08:00
305c3fc652
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-12 16:53:09 -08:00
313c01433d
Remove add zfs_i18n dependency
2008-12-12 16:41:22 -08:00
fe0cad8ba9
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2008-12-12 08:59:38 -08:00
bc1ce928f6
Add makefiles
2008-12-12 08:57:54 -08:00
b62b4773d1
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2008-12-11 15:28:31 -08:00
a2d1d32c17
move vdev_disk to it's new home
2008-12-11 15:26:36 -08:00
526bb71c86
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-11 15:24:53 -08:00
d4ba0b9b50
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-11 15:24:35 -08:00
c4de553f18
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-11 15:24:32 -08:00
cdc7d2613e
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2008-12-11 15:24:07 -08:00
444d9f20c3
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-11 15:24:05 -08:00
6cc6f50a02
Move to new home
2008-12-11 15:21:20 -08:00
f5290f405c
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2008-12-11 15:19:18 -08:00
fc5f5929e7
move zpios to the correct dirs
2008-12-11 15:17:33 -08:00
2c028659ab
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-11 15:00:19 -08:00
477a85d905
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-11 15:00:01 -08:00
6d37a4ad97
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-11 14:59:57 -08:00
d68cecbb9d
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-11 14:59:52 -08:00
c35e513cc4
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-11 14:59:48 -08:00
347e860de3
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-11 14:59:47 -08:00
409a33d29e
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-11 14:59:41 -08:00
515c1981f2
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-11 14:59:39 -08:00
a3c66a6b89
Resolve conflict
2008-12-11 14:58:34 -08:00
593aa3e10d
Move all current Makefiles to correct locations, updates still needed
2008-12-11 14:55:55 -08:00
b6bcc8a256
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-11 14:26:53 -08:00
2bcfa6809c
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-11 14:26:34 -08:00
4ebd4f1f00
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-11 14:26:29 -08:00
45ea2016b4
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-11 14:26:24 -08:00
67e283a94c
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-11 14:26:19 -08:00
2fd4174589
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-11 14:26:18 -08:00
9dfa18b709
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-11 14:26:11 -08:00
8f8a7e587a
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-11 14:26:10 -08:00
3bd537afcc
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-11 14:25:35 -08:00
503068ecec
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-11 14:25:32 -08:00
4bc4fbeb38
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-11 14:25:29 -08:00
208f59182a
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-11 14:25:28 -08:00
32a5a583a3
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2008-12-11 14:25:22 -08:00
b53201c0ca
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-12-11 14:25:16 -08:00
1e849d9b3b
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2008-12-11 14:25:08 -08:00
3f688a4bd8
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-12-11 14:25:07 -08:00
b8294b1311
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-11 14:25:05 -08:00
022db7f816
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2008-12-11 14:25:01 -08:00
9af6637db5
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2008-12-11 14:24:57 -08:00
c325ac879c
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2008-12-11 14:24:56 -08:00
3e2988aa8b
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2008-12-11 14:24:50 -08:00
82c8f9af50
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-11 14:24:49 -08:00
9b3c631dbd
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-12-11 14:24:48 -08:00
a4076c7544
Script updates
2008-12-11 14:21:14 -08:00
c4911ece24
Move library files to lib
2008-12-11 14:16:55 -08:00
a83549fbf3
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-11 14:05:38 -08:00
31927647a8
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-11 14:05:18 -08:00
b9c746ed0b
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-11 14:05:13 -08:00
fdff27558a
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-11 14:05:08 -08:00
76678238e3
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-11 14:05:03 -08:00
dfc7c1463a
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-11 14:05:02 -08:00
13dd117d28
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-11 14:04:55 -08:00
94e1055395
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-11 14:04:54 -08:00
44ffa43709
Resolve conflict
2008-12-11 14:01:47 -08:00
98ce19f04c
Update avl, nvpair, spl to unique build dirs
2008-12-11 13:54:57 -08:00
de2d4da1a4
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-11 11:37:26 -08:00
11e1ce8c2e
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-11 11:36:50 -08:00
076f7c6a5f
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-11 11:36:40 -08:00
7515df142f
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-11 11:36:31 -08:00
028c2e29e9
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2008-12-11 11:36:22 -08:00
ef5070a38b
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2008-12-11 11:36:17 -08:00
3c0ff259db
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2008-12-11 11:36:05 -08:00
5bb8f9ec25
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-11 11:36:00 -08:00
aca9d98817
Fix conflict
2008-12-11 11:34:16 -08:00
8aad84f781
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-11 11:27:12 -08:00
e152d6e601
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-11 11:27:10 -08:00
206ceddde8
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2008-12-11 11:26:49 -08:00
f421307e1b
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-12-11 11:26:25 -08:00
84e65c5c1e
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2008-12-11 11:25:50 -08:00
d00b912ed9
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-12-11 11:25:48 -08:00
756a122d37
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-11 11:25:42 -08:00
d6ccbb14c5
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2008-12-11 11:25:28 -08:00
cdd670cb2f
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2008-12-11 11:25:15 -08:00
8f8ac4288f
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2008-12-11 11:25:09 -08:00
b342e90e44
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2008-12-11 11:24:51 -08:00
4f5d567cfd
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-11 11:24:45 -08:00
3420896332
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-12-11 11:24:42 -08:00
172bb4bd5e
Move the world out of /zfs/ and seperate out module build tree
2008-12-11 11:08:09 -08:00
Brian Behlendorf