Brian Behlendorf
|
8241395b5a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-02-18 14:35:05 -08:00 |
|
Brian Behlendorf
|
855a863bb2
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-02-18 14:34:48 -08:00 |
|
Brian Behlendorf
|
9f4865e4ca
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-02-18 14:34:45 -08:00 |
|
Brian Behlendorf
|
6c27c02cf2
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-02-18 14:33:38 -08:00 |
|
Brian Behlendorf
|
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 |
|
Brian Behlendorf
|
c893c7cf3d
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-02-18 14:30:56 -08:00 |
|
Brian Behlendorf
|
7872d84be6
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-02-18 14:30:54 -08:00 |
|
Brian Behlendorf
|
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 |
|
Brian Behlendorf
|
dbc3a5ec55
|
Merge commit 'refs/top-bases/fix-list' into fix-list
Conflicts:
module/zfs/arc.c
|
2009-02-18 14:29:48 -08:00 |
|
Brian Behlendorf
|
7fe1b71533
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2009-02-18 14:29:19 -08:00 |
|
Brian Behlendorf
|
404fd8578f
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2009-02-18 14:28:27 -08:00 |
|
Brian Behlendorf
|
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 |
|
Brian Behlendorf
|
3ac1fca8dc
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2009-02-18 14:27:31 -08:00 |
|
Brian Behlendorf
|
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 |
|
Brian Behlendorf
|
3eb7fa9afd
|
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
|
2009-02-18 14:04:08 -08:00 |
|
Brian Behlendorf
|
32d4d74b04
|
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
|
2009-02-18 14:04:04 -08:00 |
|
Brian Behlendorf
|
6fa66816c1
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
Conflicts:
module/zfs/arc.c
|
2009-02-18 14:03:55 -08:00 |
|
Brian Behlendorf
|
5be9e325a1
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
Conflicts:
module/zfs/arc.c
|
2009-02-18 14:03:22 -08:00 |
|
Brian Behlendorf
|
ba528721da
|
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
|
2009-02-18 13:12:58 -08:00 |
|
Brian Behlendorf
|
0b8e48b813
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2009-02-18 13:12:53 -08:00 |
|
Brian Behlendorf
|
e203e7b48f
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2009-02-18 13:12:35 -08:00 |
|
Brian Behlendorf
|
f686a87058
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Conflicts:
module/zfs/arc.c
|
2009-02-18 13:12:26 -08:00 |
|
Brian Behlendorf
|
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 |
|
Brian Behlendorf
|
d164b20935
|
Rebase master to b108
|
2009-02-18 12:51:31 -08:00 |
|
Brian Behlendorf
|
e47c3be7df
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-02-07 13:12:09 -08:00 |
|
Brian Behlendorf
|
4e4327a0a5
|
Drop the KERNEL portion of this check, just checking __i386 is correct
|
2009-02-07 13:10:16 -08:00 |
|
Brian Behlendorf
|
b52f710397
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-02-06 10:12:34 -08:00 |
|
Brian Behlendorf
|
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 |
|
Brian Behlendorf
|
895c8b9629
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-02-04 15:21:38 -08:00 |
|
Brian Behlendorf
|
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 |
|
Brian Behlendorf
|
98674d530a
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-26 16:50:32 -08:00 |
|
Brian Behlendorf
|
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 |
|
Brian Behlendorf
|
92dce85827
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-21 11:02:12 -08:00 |
|
Brian Behlendorf
|
ab8f4ca43f
|
Convert ASSERT() to VERIFY() for better coverage
|
2009-01-21 10:59:06 -08:00 |
|
Brian Behlendorf
|
ef96542acb
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-15 16:34:51 -08:00 |
|
Brian Behlendorf
|
7c8ca1d516
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-15 16:34:13 -08:00 |
|
Brian Behlendorf
|
42b3648e0b
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-15 16:33:22 -08:00 |
|
Brian Behlendorf
|
8ff964a4f3
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-15 16:33:09 -08:00 |
|
Brian Behlendorf
|
93308c3507
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-15 16:32:56 -08:00 |
|
Brian Behlendorf
|
56b47e5767
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-15 16:32:42 -08:00 |
|
Brian Behlendorf
|
f1300cddb7
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-15 16:32:30 -08:00 |
|
Brian Behlendorf
|
f33c13d11d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-15 16:32:27 -08:00 |
|
Brian Behlendorf
|
c090c8b1aa
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-15 16:32:10 -08:00 |
|
Brian Behlendorf
|
41cba9f136
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-15 16:32:08 -08:00 |
|
Brian Behlendorf
|
ea2c8a4e37
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-15 16:30:58 -08:00 |
|
Brian Behlendorf
|
37cc2cedde
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-15 16:30:38 -08:00 |
|
Brian Behlendorf
|
b8e5edb299
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-15 16:30:32 -08:00 |
|
Brian Behlendorf
|
fb256294c9
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-15 16:30:29 -08:00 |
|
Brian Behlendorf
|
c5b335f613
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-15 16:30:28 -08:00 |
|
Brian Behlendorf
|
31cddc8a0b
|
Merge branch 'fix-locks' into refs/top-bases/fix-branch
|
2009-01-15 16:30:25 -08:00 |
|
Brian Behlendorf
|
50186c2b57
|
All init and destroy initialized pulled in
|
2009-01-15 16:25:25 -08:00 |
|
Brian Behlendorf
|
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 |
|
Brian Behlendorf
|
38a2cb40de
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-15 15:31:02 -08:00 |
|
Brian Behlendorf
|
50a6b919a4
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-15 15:30:46 -08:00 |
|
Brian Behlendorf
|
50881047b6
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-15 15:30:25 -08:00 |
|
Brian Behlendorf
|
461fe17e5f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-15 15:30:20 -08:00 |
|
Brian Behlendorf
|
14caea82a9
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-15 15:30:15 -08:00 |
|
Brian Behlendorf
|
1724a1dd37
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-15 15:30:10 -08:00 |
|
Brian Behlendorf
|
865347e0be
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-15 15:30:05 -08:00 |
|
Brian Behlendorf
|
702ba8cdf7
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-15 15:30:04 -08:00 |
|
Brian Behlendorf
|
930ef960bc
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-15 15:29:56 -08:00 |
|
Brian Behlendorf
|
9c8802c7e4
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-15 15:29:55 -08:00 |
|
Brian Behlendorf
|
498140c4cb
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-15 15:29:26 -08:00 |
|
Brian Behlendorf
|
15cd579536
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-15 15:29:18 -08:00 |
|
Brian Behlendorf
|
2e84c7ae79
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-15 15:29:16 -08:00 |
|
Brian Behlendorf
|
8511545409
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-15 15:29:15 -08:00 |
|
Brian Behlendorf
|
fa36244fba
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-15 15:29:14 -08:00 |
|
Brian Behlendorf
|
4c0be07ad9
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-15 15:29:13 -08:00 |
|
Brian Behlendorf
|
22284754e0
|
Resolve C90 int declared in for() construct
|
2009-01-15 15:26:54 -08:00 |
|
Brian Behlendorf
|
d2150abea0
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-15 14:53:57 -08:00 |
|
Brian Behlendorf
|
b8709a7d90
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-15 14:53:41 -08:00 |
|
Brian Behlendorf
|
471992c1d4
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-15 14:53:19 -08:00 |
|
Brian Behlendorf
|
41c372fa3f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-15 14:53:14 -08:00 |
|
Brian Behlendorf
|
7666cb567e
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-15 14:53:08 -08:00 |
|
Brian Behlendorf
|
c64f23d8d7
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-15 14:53:02 -08:00 |
|
Brian Behlendorf
|
c6412aa523
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-15 14:52:57 -08:00 |
|
Brian Behlendorf
|
7c879f3b8b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-15 14:52:56 -08:00 |
|
Brian Behlendorf
|
86b606d846
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-15 14:52:48 -08:00 |
|
Brian Behlendorf
|
141235d905
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-15 14:52:47 -08:00 |
|
Brian Behlendorf
|
c5194270a0
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-15 14:52:17 -08:00 |
|
Brian Behlendorf
|
2763e879ec
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-15 14:52:08 -08:00 |
|
Brian Behlendorf
|
b7f8d6e829
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-15 14:52:06 -08:00 |
|
Brian Behlendorf
|
63722ea81a
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-15 14:52:04 -08:00 |
|
Brian Behlendorf
|
12fb73609c
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-15 14:52:04 -08:00 |
|
Brian Behlendorf
|
e23dbee181
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-15 14:52:03 -08:00 |
|
Brian Behlendorf
|
b61295bfb6
|
Resolve C90 int declared in for() construct
|
2009-01-15 14:49:42 -08:00 |
|
Brian Behlendorf
|
435fa44075
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-15 14:40:23 -08:00 |
|
Brian Behlendorf
|
6479dc1921
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-15 14:40:07 -08:00 |
|
Brian Behlendorf
|
6088240364
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-15 14:39:47 -08:00 |
|
Brian Behlendorf
|
a74bc899dc
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-15 14:39:42 -08:00 |
|
Brian Behlendorf
|
534224345e
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-15 14:39:36 -08:00 |
|
Brian Behlendorf
|
21b9ae22f4
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-15 14:39:31 -08:00 |
|
Brian Behlendorf
|
dd2e5734f7
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-15 14:39:26 -08:00 |
|
Brian Behlendorf
|
4c1ba3d379
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-15 14:39:25 -08:00 |
|
Brian Behlendorf
|
3ffbd630ad
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-15 14:39:18 -08:00 |
|
Brian Behlendorf
|
1a4ae03863
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-15 14:39:18 -08:00 |
|
Brian Behlendorf
|
366ade9eba
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-15 14:38:50 -08:00 |
|
Brian Behlendorf
|
0f392008db
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-15 14:38:41 -08:00 |
|
Brian Behlendorf
|
fe7a703285
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-15 14:38:39 -08:00 |
|
Brian Behlendorf
|
3b6c91ec9f
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-15 14:38:38 -08:00 |
|
Brian Behlendorf
|
ec41b57eb3
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-15 14:38:38 -08:00 |
|
Brian Behlendorf
|
e9c7a643f1
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-15 14:38:37 -08:00 |
|
Brian Behlendorf
|
77f365172c
|
Resolve C90 int declared in for() construct
|
2009-01-15 14:36:27 -08:00 |
|
Brian Behlendorf
|
454835e259
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-15 14:30:55 -08:00 |
|
Brian Behlendorf
|
94c2ebf6f0
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-15 14:30:40 -08:00 |
|
Brian Behlendorf
|
b71b54c96d
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-15 14:30:19 -08:00 |
|
Brian Behlendorf
|
7dd685ccc3
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-15 14:30:14 -08:00 |
|
Brian Behlendorf
|
46123fffa2
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-15 14:30:09 -08:00 |
|
Brian Behlendorf
|
39688a10b9
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-15 14:30:04 -08:00 |
|
Brian Behlendorf
|
574b2c897e
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-15 14:29:58 -08:00 |
|
Brian Behlendorf
|
372dba924d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-15 14:29:58 -08:00 |
|
Brian Behlendorf
|
0eeb5ec0f5
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-15 14:29:50 -08:00 |
|
Brian Behlendorf
|
ab52989424
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-15 14:29:50 -08:00 |
|
Brian Behlendorf
|
2b725e7cc0
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-15 14:29:22 -08:00 |
|
Brian Behlendorf
|
b83cf899ca
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-15 14:29:13 -08:00 |
|
Brian Behlendorf
|
062f1f78c6
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-15 14:29:11 -08:00 |
|
Brian Behlendorf
|
cb55f9a832
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-15 14:29:11 -08:00 |
|
Brian Behlendorf
|
43b4c537eb
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-15 14:29:10 -08:00 |
|
Brian Behlendorf
|
f969333c73
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-15 14:29:09 -08:00 |
|
Brian Behlendorf
|
c4fc002c87
|
Resolve C90 int declared in for() construct
|
2009-01-15 14:26:52 -08:00 |
|
Brian Behlendorf
|
adcb983918
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-15 14:22:14 -08:00 |
|
Brian Behlendorf
|
de66052064
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-15 14:21:55 -08:00 |
|
Brian Behlendorf
|
594ce22168
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-15 14:21:30 -08:00 |
|
Brian Behlendorf
|
465b2c795d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-15 14:21:24 -08:00 |
|
Brian Behlendorf
|
476261f2d5
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-15 14:21:18 -08:00 |
|
Brian Behlendorf
|
2c83372734
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-15 14:21:11 -08:00 |
|
Brian Behlendorf
|
924bc262cc
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-15 14:21:05 -08:00 |
|
Brian Behlendorf
|
ee1faab64d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-15 14:21:03 -08:00 |
|
Brian Behlendorf
|
767928dcd2
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-15 14:20:55 -08:00 |
|
Brian Behlendorf
|
091a4a4ca4
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:20:49 -08:00 |
|
Brian Behlendorf
|
8122647b48
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-15 14:18:54 -08:00 |
|
Brian Behlendorf
|
1f372d9030
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:18:01 -08:00 |
|
Brian Behlendorf
|
8684f3ea64
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-15 14:16:25 -08:00 |
|
Brian Behlendorf
|
ddaad20220
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-15 14:16:23 -08:00 |
|
Brian Behlendorf
|
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 |
|
Brian Behlendorf
|
625451acfc
|
Merge commit 'refs/top-bases/fix-list' into fix-list
|
2009-01-15 14:16:14 -08:00 |
|
Brian Behlendorf
|
1d3ce40c2e
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2009-01-15 14:16:09 -08:00 |
|
Brian Behlendorf
|
089836c3e4
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:14:57 -08:00 |
|
Brian Behlendorf
|
216ce72418
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2009-01-15 14:13:46 -08:00 |
|
Brian Behlendorf
|
551838a6c8
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:13:39 -08:00 |
|
Brian Behlendorf
|
b633e4f669
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2009-01-15 14:11:26 -08:00 |
|
Brian Behlendorf
|
da7151a89e
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:11:19 -08:00 |
|
Brian Behlendorf
|
7b54fe44dc
|
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
|
2009-01-15 14:05:38 -08:00 |
|
Brian Behlendorf
|
7aa64936aa
|
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
|
2009-01-15 14:05:35 -08:00 |
|
Brian Behlendorf
|
977fef2ba7
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2009-01-15 14:05:32 -08:00 |
|
Brian Behlendorf
|
2f36bf5af4
|
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
|
2009-01-15 14:05:29 -08:00 |
|
Brian Behlendorf
|
35a269c06c
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2009-01-15 14:05:26 -08:00 |
|
Brian Behlendorf
|
a2e601c6e3
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2009-01-15 14:04:39 -08:00 |
|
Brian Behlendorf
|
3fa768e21b
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:04:35 -08:00 |
|
Brian Behlendorf
|
d3df6b2012
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2009-01-15 14:01:51 -08:00 |
|
Brian Behlendorf
|
fb5f0bc833
|
Rebase master to b105
|
2009-01-15 13:59:39 -08:00 |
|
Brian Behlendorf
|
8b1bccfddf
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-14 13:32:44 -08:00 |
|
Brian Behlendorf
|
1b6bc0866d
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-14 13:32:40 -08:00 |
|
Brian Behlendorf
|
b874e980f9
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-14 13:32:39 -08:00 |
|
Brian Behlendorf
|
904640e3c7
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-14 13:32:33 -08:00 |
|
Brian Behlendorf
|
fb941c67fa
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-14 13:32:31 -08:00 |
|
Brian Behlendorf
|
c0edd1f948
|
Remove unneeded header
|
2009-01-14 13:30:32 -08:00 |
|
Brian Behlendorf
|
50832652c2
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-14 08:42:33 -08:00 |
|
Brian Behlendorf
|
03f6a88536
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-14 08:42:29 -08:00 |
|
Brian Behlendorf
|
926ec0657d
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-14 08:42:21 -08:00 |
|
Brian Behlendorf
|
04443d2d7a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-14 08:42:19 -08:00 |
|
Brian Behlendorf
|
ad1dde3678
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-14 08:42:11 -08:00 |
|
Brian Behlendorf
|
b8ca971861
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-14 08:42:00 -08:00 |
|
Brian Behlendorf
|
1194e0412f
|
Change all instances of kpios to zpios
|
2009-01-14 08:38:35 -08:00 |
|
Brian Behlendorf
|
f63f4dd2cd
|
Remove unneeded chunk, create a FS the real way with an ioctl
|
2009-01-14 08:26:09 -08:00 |
|
Brian Behlendorf
|
4497cfb321
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:49:26 -08:00 |
|
Brian Behlendorf
|
9ab30b2e96
|
Use zpios not kpios for referce
|
2009-01-13 16:42:21 -08:00 |
|
Brian Behlendorf
|
7423bcfe2a
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-13 16:10:01 -08:00 |
|
Brian Behlendorf
|
7635d14cd1
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-13 16:09:27 -08:00 |
|
Brian Behlendorf
|
fd3adc8f0a
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-13 16:08:43 -08:00 |
|
Brian Behlendorf
|
2dac6d5542
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-13 16:08:32 -08:00 |
|
Brian Behlendorf
|
df809b8ca1
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-13 16:08:23 -08:00 |
|
Brian Behlendorf
|
ae893fadc9
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-13 16:08:13 -08:00 |
|
Brian Behlendorf
|
ef9e51e506
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-13 16:08:03 -08:00 |
|
Brian Behlendorf
|
97f656ab18
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-13 16:08:02 -08:00 |
|
Brian Behlendorf
|
7783aee79c
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-13 16:07:47 -08:00 |
|
Brian Behlendorf
|
fce0143a40
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 16:07:45 -08:00 |
|
Brian Behlendorf
|
66889afe82
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-13 16:06:54 -08:00 |
|
Brian Behlendorf
|
083b3d000c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-13 16:06:37 -08:00 |
|
Brian Behlendorf
|
622ce10cde
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-13 16:06:30 -08:00 |
|
Brian Behlendorf
|
04d7ae5f22
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 16:06:28 -08:00 |
|
Brian Behlendorf
|
c186f81c6d
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 16:06:26 -08:00 |
|
Brian Behlendorf
|
e1632568f1
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-13 16:06:23 -08:00 |
|
Brian Behlendorf
|
be0b4029db
|
Initialize list links
|
2009-01-13 16:02:19 -08:00 |
|
Brian Behlendorf
|
7b7223dc37
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-13 15:35:40 -08:00 |
|
Brian Behlendorf
|
5ae7f2d447
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-13 15:35:25 -08:00 |
|
Brian Behlendorf
|
b0064d448c
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-13 15:35:06 -08:00 |
|
Brian Behlendorf
|
95db697cc4
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-13 15:35:01 -08:00 |
|
Brian Behlendorf
|
12e5cfca38
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-13 15:34:56 -08:00 |
|
Brian Behlendorf
|
392993d32a
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-13 15:34:51 -08:00 |
|
Brian Behlendorf
|
d92517e2a1
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-13 15:34:46 -08:00 |
|
Brian Behlendorf
|
9cccf52448
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-13 15:34:46 -08:00 |
|
Brian Behlendorf
|
43ac9f83e1
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-13 15:34:39 -08:00 |
|
Brian Behlendorf
|
c3335290e2
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 15:34:38 -08:00 |
|
Brian Behlendorf
|
4317840a97
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-13 15:34:11 -08:00 |
|
Brian Behlendorf
|
38f7defc95
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:34:04 -08:00 |
|
Brian Behlendorf
|
93b6e66d9b
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-13 15:34:01 -08:00 |
|
Brian Behlendorf
|
32baeb1712
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 15:34:01 -08:00 |
|
Brian Behlendorf
|
0d6b81fcca
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 15:34:00 -08:00 |
|
Brian Behlendorf
|
43cd437415
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-13 15:33:59 -08:00 |
|
Brian Behlendorf
|
94944fab96
|
Fix proper list node initialization
|
2009-01-13 15:31:58 -08:00 |
|
Brian Behlendorf
|
d0fe66ebf8
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-13 15:08:46 -08:00 |
|
Brian Behlendorf
|
5ddcc115b3
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-13 15:08:32 -08:00 |
|
Brian Behlendorf
|
4ea3a09fde
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-13 15:08:12 -08:00 |
|
Brian Behlendorf
|
de43f9a57c
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-13 15:08:08 -08:00 |
|
Brian Behlendorf
|
c6a5786c2f
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-13 15:08:02 -08:00 |
|
Brian Behlendorf
|
d851db8193
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-13 15:07:58 -08:00 |
|
Brian Behlendorf
|
5691cd6443
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-13 15:07:53 -08:00 |
|
Brian Behlendorf
|
f661985075
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-13 15:07:52 -08:00 |
|
Brian Behlendorf
|
62d5f771e5
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-13 15:07:45 -08:00 |
|
Brian Behlendorf
|
925ed2c7a0
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 15:07:44 -08:00 |
|
Brian Behlendorf
|
340e3e78b5
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-13 15:07:18 -08:00 |
|
Brian Behlendorf
|
a93d76eb1b
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:07:11 -08:00 |
|
Brian Behlendorf
|
d2eae65894
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-13 15:07:09 -08:00 |
|
Brian Behlendorf
|
b14513e826
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 15:07:08 -08:00 |
|
Brian Behlendorf
|
4c31283afc
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 15:07:07 -08:00 |
|
Brian Behlendorf
|
2e9cd667d0
|
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
|
2009-01-13 15:07:06 -08:00 |
|
Brian Behlendorf
|
fcd2296399
|
Additional rw_lock not being initialized cleaned in updated code
|
2009-01-13 15:05:02 -08:00 |
|
Brian Behlendorf
|
14f8f1d4bf
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-13 15:03:50 -08:00 |
|
Brian Behlendorf
|
ff35f88f33
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-13 15:03:36 -08:00 |
|
Brian Behlendorf
|
0231d2bb13
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-13 15:03:17 -08:00 |
|
Brian Behlendorf
|
e095be1cc5
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-13 15:03:12 -08:00 |
|
Brian Behlendorf
|
46f868c3c3
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-13 15:03:07 -08:00 |
|
Brian Behlendorf
|
89351f06c5
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-13 15:03:02 -08:00 |
|
Brian Behlendorf
|
28d3375587
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-13 15:02:58 -08:00 |
|
Brian Behlendorf
|
3486f62c97
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-13 15:02:57 -08:00 |
|
Brian Behlendorf
|
fd1da7d6b9
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-13 15:02:50 -08:00 |
|
Brian Behlendorf
|
042deede25
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 15:02:49 -08:00 |
|
Brian Behlendorf
|
eb142d443a
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-13 15:02:23 -08:00 |
|
Brian Behlendorf
|
149c57fd06
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-13 15:02:15 -08:00 |
|
Brian Behlendorf
|
acd48f80d9
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-13 15:02:13 -08:00 |
|
Brian Behlendorf
|
60f5ac8ac7
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 15:02:12 -08:00 |
|
Brian Behlendorf
|
4a5bd7a3a8
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 15:02:11 -08:00 |
|
Brian Behlendorf
|
6c96fc31e9
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-13 15:02:10 -08:00 |
|
Brian Behlendorf
|
bec036636e
|
List cleanup and use of list_node_init initializer
|
2009-01-13 15:00:12 -08:00 |
|
Brian Behlendorf
|
d2bbb879b3
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-13 14:19:51 -08:00 |
|
Brian Behlendorf
|
6bc9ddf743
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-13 14:19:36 -08:00 |
|
Brian Behlendorf
|
95f112de08
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-13 14:19:17 -08:00 |
|
Brian Behlendorf
|
4ef8421b03
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-13 14:19:13 -08:00 |
|
Brian Behlendorf
|
e67acb10c7
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-13 14:19:08 -08:00 |
|
Brian Behlendorf
|
d588bf5c71
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-13 14:19:03 -08:00 |
|
Brian Behlendorf
|
b935807a03
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-13 14:18:58 -08:00 |
|
Brian Behlendorf
|
95b289e62b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-13 14:18:58 -08:00 |
|
Brian Behlendorf
|
6ec00152b1
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-13 14:18:51 -08:00 |
|
Brian Behlendorf
|
b289f6dd98
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 14:18:50 -08:00 |
|
Brian Behlendorf
|
682d4461a2
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-13 14:18:24 -08:00 |
|
Brian Behlendorf
|
b052188ff6
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-13 14:18:16 -08:00 |
|
Brian Behlendorf
|
3b3a155dc4
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-13 14:18:12 -08:00 |
|
Brian Behlendorf
|
bdb0ce1a0d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 14:18:11 -08:00 |
|
Brian Behlendorf
|
552c9e1abb
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-13 14:18:10 -08:00 |
|
Brian Behlendorf
|
c6f1eca44b
|
Merge branch 'fix-list' into refs/top-bases/fix-branch
|
2009-01-13 14:18:09 -08:00 |
|
Brian Behlendorf
|
2ea04834bf
|
Remove assertion for now
|
2009-01-13 14:16:11 -08:00 |
|
Brian Behlendorf
|
ea31356386
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-13 13:34:08 -08:00 |
|
Brian Behlendorf
|
9fc1da9334
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-13 13:33:54 -08:00 |
|
Brian Behlendorf
|
eccb6aa8e4
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-13 13:33:36 -08:00 |
|
Brian Behlendorf
|
323f4f67dd
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-13 13:33:31 -08:00 |
|
Brian Behlendorf
|
5299c3259f
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-13 13:33:26 -08:00 |
|
Brian Behlendorf
|
721cadbea8
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-13 13:33:22 -08:00 |
|
Brian Behlendorf
|
4b655d95db
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-13 13:33:17 -08:00 |
|
Brian Behlendorf
|
a5643b08c3
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-13 13:33:16 -08:00 |
|
Brian Behlendorf
|
43b31e2884
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-13 13:33:10 -08:00 |
|
Brian Behlendorf
|
935c8157f9
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 13:33:09 -08:00 |
|
Brian Behlendorf
|
e1f7f2efdb
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-13 13:32:44 -08:00 |
|
Brian Behlendorf
|
bad8fae24d
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-13 13:32:36 -08:00 |
|
Brian Behlendorf
|
6eb210ddfe
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-13 13:32:32 -08:00 |
|
Brian Behlendorf
|
f8b66dcc4f
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-13 13:32:31 -08:00 |
|
Brian Behlendorf
|
8ad629750e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-13 13:32:30 -08:00 |
|
Brian Behlendorf
|
bb9b10a830
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-13 13:32:29 -08:00 |
|
Brian Behlendorf
|
b73b29ab8e
|
Fix c90 issue with { }
|
2009-01-13 13:30:35 -08:00 |
|
Brian Behlendorf
|
08bc5aa405
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-13 12:32:30 -08:00 |
|
Brian Behlendorf
|
1481a4a7df
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-13 12:32:19 -08:00 |
|
Brian Behlendorf
|
d07009d2f7
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-13 12:32:18 -08:00 |
|
Brian Behlendorf
|
a0f86c6571
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-13 12:32:07 -08:00 |
|
Brian Behlendorf
|
6c2e910597
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-13 12:32:03 -08:00 |
|
Brian Behlendorf
|
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 |
|
Brian Behlendorf
|
f15ef90618
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-13 11:18:11 -08:00 |
|
Brian Behlendorf
|
7356c2045e
|
Update zpios.sh script to reference zfs not zpool, additionally remove unneed module load console message
|
2009-01-13 11:16:12 -08:00 |
|
Brian Behlendorf
|
a62a385848
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 16:54:15 -08:00 |
|
Brian Behlendorf
|
0093e81879
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 16:54:05 -08:00 |
|
Brian Behlendorf
|
ca328c5d30
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 16:54:04 -08:00 |
|
Brian Behlendorf
|
13ab1d30be
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 16:53:53 -08:00 |
|
Brian Behlendorf
|
58df2601b0
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 16:53:49 -08:00 |
|
Brian Behlendorf
|
3977cefecc
|
Update load/unload message, mknod /dev/zfs when udev is unavailable
|
2009-01-09 16:50:28 -08:00 |
|
Brian Behlendorf
|
2250c070f8
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 16:42:12 -08:00 |
|
Brian Behlendorf
|
3122996061
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 16:42:02 -08:00 |
|
Brian Behlendorf
|
d6e2f4a455
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 16:42:01 -08:00 |
|
Brian Behlendorf
|
bd06c6eb0e
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 16:41:50 -08:00 |
|
Brian Behlendorf
|
cd56628b75
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 16:41:46 -08:00 |
|
Brian Behlendorf
|
7001fd57fa
|
Register sensible init/fini hooks
|
2009-01-09 16:38:13 -08:00 |
|
Brian Behlendorf
|
f3a2522a14
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 16:32:36 -08:00 |
|
Brian Behlendorf
|
91f6492ef5
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 16:32:26 -08:00 |
|
Brian Behlendorf
|
4530d592f8
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 16:32:24 -08:00 |
|
Brian Behlendorf
|
1ccec67674
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 16:32:13 -08:00 |
|
Brian Behlendorf
|
b19ccd10af
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 16:32:09 -08:00 |
|
Brian Behlendorf
|
d9a45283ce
|
Add ZFS load/unload console messages
|
2009-01-09 16:28:26 -08:00 |
|
Brian Behlendorf
|
598a2f5f4d
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-09 16:11:55 -08:00 |
|
Brian Behlendorf
|
2f2ae376e8
|
ifdef out some zvol specific ioctls
|
2009-01-09 16:08:18 -08:00 |
|
Brian Behlendorf
|
1cf2f6a63e
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:57:21 -08:00 |
|
Brian Behlendorf
|
1475f7234b
|
Make the ZPL only bits conditional
|
2009-01-09 15:55:19 -08:00 |
|
Brian Behlendorf
|
1d1886b5f9
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 15:52:13 -08:00 |
|
Brian Behlendorf
|
c0f45a99fc
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 15:52:08 -08:00 |
|
Brian Behlendorf
|
3f70ee0f8a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 15:52:07 -08:00 |
|
Brian Behlendorf
|
2148f8256b
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:52:02 -08:00 |
|
Brian Behlendorf
|
ca3acc4f50
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 15:52:00 -08:00 |
|
Brian Behlendorf
|
1dc5e6d02e
|
Remove HAVE_SPL should be HAVE_ZPL
|
2009-01-09 15:50:00 -08:00 |
|
Brian Behlendorf
|
ca48ebe083
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:36:18 -08:00 |
|
Brian Behlendorf
|
f2b69bd921
|
Fix 2 more instances on XDR encoding which is not yet supported, us native encode
|
2009-01-09 15:34:32 -08:00 |
|
Brian Behlendorf
|
8f4340d3e8
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:11:58 -08:00 |
|
Brian Behlendorf
|
39184ef9b4
|
Only needed by ZPL
|
2009-01-09 15:08:36 -08:00 |
|
Brian Behlendorf
|
bed94035fd
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:46:42 -08:00 |
|
Brian Behlendorf
|
a7e5f34acb
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-09 14:46:41 -08:00 |
|
Brian Behlendorf
|
7ea7020636
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-09 14:46:27 -08:00 |
|
Brian Behlendorf
|
0f48a52f65
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-09 14:46:10 -08:00 |
|
Brian Behlendorf
|
d7e52cccea
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-09 14:46:05 -08:00 |
|
Brian Behlendorf
|
d584ad239d
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-09 14:46:01 -08:00 |
|
Brian Behlendorf
|
4022f85bac
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 14:45:56 -08:00 |
|
Brian Behlendorf
|
c766077d8c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 14:45:52 -08:00 |
|
Brian Behlendorf
|
3f48c3fcd5
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 14:45:52 -08:00 |
|
Brian Behlendorf
|
764c8c5940
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 14:45:45 -08:00 |
|
Brian Behlendorf
|
be3a17e437
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 14:45:45 -08:00 |
|
Brian Behlendorf
|
c46ae60147
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-09 14:45:20 -08:00 |
|
Brian Behlendorf
|
d315fcf28e
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:45:13 -08:00 |
|
Brian Behlendorf
|
acafe53c8e
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-09 14:45:12 -08:00 |
|
Brian Behlendorf
|
fba5a806a8
|
ifdef HAVE_ZPL out source files with only ZPL bits
|
2009-01-09 14:43:22 -08:00 |
|
Brian Behlendorf
|
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 |
|
Brian Behlendorf
|
7b6040235d
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:30:32 -08:00 |
|
Brian Behlendorf
|
9ef637b057
|
Add minimum needed zvol bits
|
2009-01-09 14:28:50 -08:00 |
|
Brian Behlendorf
|
bd6fb32e4c
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-09 14:19:25 -08:00 |
|
Brian Behlendorf
|
cdba663ce4
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-09 14:19:11 -08:00 |
|
Brian Behlendorf
|
f4ae82d019
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-09 14:18:52 -08:00 |
|
Brian Behlendorf
|
ccb1f1c5d4
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-09 14:18:47 -08:00 |
|
Brian Behlendorf
|
5e7aec0a54
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-09 14:18:43 -08:00 |
|
Brian Behlendorf
|
cb25e32a1c
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 14:18:38 -08:00 |
|
Brian Behlendorf
|
36eeb5eeb2
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 14:18:34 -08:00 |
|
Brian Behlendorf
|
b55164f2cb
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 14:18:33 -08:00 |
|
Brian Behlendorf
|
f4bef22e4e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 14:18:26 -08:00 |
|
Brian Behlendorf
|
03a4aefbcf
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 14:18:25 -08:00 |
|
Brian Behlendorf
|
3519e128ba
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-09 14:18:00 -08:00 |
|
Brian Behlendorf
|
1e181bcb77
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:17:52 -08:00 |
|
Brian Behlendorf
|
e17f9cb711
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-09 14:17:50 -08:00 |
|
Brian Behlendorf
|
6b32aaea67
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-09 14:17:49 -08:00 |
|
Brian Behlendorf
|
86eb46d20b
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-09 14:17:49 -08:00 |
|
Brian Behlendorf
|
578c9645df
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-09 14:17:48 -08:00 |
|
Brian Behlendorf
|
902ce659b0
|
Fix c90 compliance issue
|
2009-01-09 14:15:56 -08:00 |
|
Brian Behlendorf
|
9f52c74893
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:07:24 -08:00 |
|
Brian Behlendorf
|
203d2b01b8
|
Make most of the vfsops conditional on ZPL support
|
2009-01-09 14:02:40 -08:00 |
|
Brian Behlendorf
|
e64d6361f7
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-09 13:34:48 -08:00 |
|
Brian Behlendorf
|
82d446c832
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-09 13:34:34 -08:00 |
|
Brian Behlendorf
|
c6ddafc107
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-09 13:34:15 -08:00 |
|
Brian Behlendorf
|
b881b78bc9
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-09 13:34:10 -08:00 |
|
Brian Behlendorf
|
980384b4bc
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-09 13:34:05 -08:00 |
|
Brian Behlendorf
|
887409fdc4
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 13:34:01 -08:00 |
|
Brian Behlendorf
|
6a2d852b35
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 13:33:56 -08:00 |
|
Brian Behlendorf
|
c7b309f9b1
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 13:33:55 -08:00 |
|
Brian Behlendorf
|
d3d2ff38e8
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 13:33:50 -08:00 |
|
Brian Behlendorf
|
8d12e9b274
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 13:33:48 -08:00 |
|
Brian Behlendorf
|
bc5e2d8660
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 13:33:48 -08:00 |
|
Brian Behlendorf
|
f91ee39124
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-09 13:33:22 -08:00 |
|
Brian Behlendorf
|
bf5a93e1ec
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-09 13:33:14 -08:00 |
|
Brian Behlendorf
|
7357c92d76
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-09 13:33:12 -08:00 |
|
Brian Behlendorf
|
7a7a074d3d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-09 13:33:11 -08:00 |
|
Brian Behlendorf
|
cd5e331e68
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-09 13:33:10 -08:00 |
|
Brian Behlendorf
|
953d302b87
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2009-01-09 13:33:09 -08:00 |
|
Brian Behlendorf
|
04638ead67
|
Change zpool module name to zfs and update references
|
2009-01-09 13:31:16 -08:00 |
|
Brian Behlendorf
|
ca4fc6ef63
|
Fix cast
|
2009-01-09 13:29:41 -08:00 |
|
Brian Behlendorf
|
68585e71a8
|
Get correct exit prototype
|
2009-01-09 13:28:42 -08:00 |
|
Brian Behlendorf
|
711774c008
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 13:01:22 -08:00 |
|
Brian Behlendorf
|
f1549b9636
|
Take tsd_* functions out for now, we need it for the ZPL later
|
2009-01-09 12:53:37 -08:00 |
|
Brian Behlendorf
|
0ae94a5f86
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-09 12:50:45 -08:00 |
|
Brian Behlendorf
|
b77b7a4741
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-09 12:50:10 -08:00 |
|
Brian Behlendorf
|
741b7a18ac
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-09 12:49:24 -08:00 |
|
Brian Behlendorf
|
613eaeb74b
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-09 12:49:14 -08:00 |
|
Brian Behlendorf
|
0963498e86
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-09 12:49:00 -08:00 |
|
Brian Behlendorf
|
786b3d6b88
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 12:48:49 -08:00 |
|
Brian Behlendorf
|
6e62e110c3
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 12:48:35 -08:00 |
|
Brian Behlendorf
|
9199436355
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 12:48:34 -08:00 |
|
Brian Behlendorf
|
fb1f1596c7
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 12:48:19 -08:00 |
|
Brian Behlendorf
|
18f3ecb485
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 12:48:17 -08:00 |
|
Brian Behlendorf
|
7b9fb1850a
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-09 12:47:16 -08:00 |
|
Brian Behlendorf
|
f5a274607e
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-09 12:46:56 -08:00 |
|
Brian Behlendorf
|
97ad681fc7
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-09 12:46:46 -08:00 |
|
Brian Behlendorf
|
129afe3ce8
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-09 12:46:44 -08:00 |
|
Brian Behlendorf
|
b4d27767d8
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-09 12:46:42 -08:00 |
|
Brian Behlendorf
|
b3064162aa
|
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
|
2009-01-09 12:46:40 -08:00 |
|
Brian Behlendorf
|
cb5fc9440b
|
Remove extra defaults
|
2009-01-09 12:42:27 -08:00 |
|
Brian Behlendorf
|
e2e5e6e16a
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 11:44:49 -08:00 |
|
Brian Behlendorf
|
a18eb3cc93
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 11:44:43 -08:00 |
|
Brian Behlendorf
|
2735cd4ab1
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 11:44:43 -08:00 |
|
Brian Behlendorf
|
3bed287e00
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:44:37 -08:00 |
|
Brian Behlendorf
|
37cdc79b95
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 11:44:34 -08:00 |
|
Brian Behlendorf
|
f0f1f7362d
|
Remove invalid tunable
|
2009-01-09 11:42:31 -08:00 |
|
Brian Behlendorf
|
e39cb8adab
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 11:31:53 -08:00 |
|
Brian Behlendorf
|
a4df8635db
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 11:31:48 -08:00 |
|
Brian Behlendorf
|
ab0e08c058
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 11:31:47 -08:00 |
|
Brian Behlendorf
|
6b4205fe71
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:31:42 -08:00 |
|
Brian Behlendorf
|
f612969bdf
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 11:31:40 -08:00 |
|
Brian Behlendorf
|
dd50143ea1
|
Add module load/unload entry point hooks and ioctl integration
|
2009-01-09 11:21:59 -08:00 |
|
Brian Behlendorf
|
2f1ba85948
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:17:59 -08:00 |
|
Brian Behlendorf
|
be9f92ecd6
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:17:57 -08:00 |
|
Brian Behlendorf
|
7902b5fdf1
|
Add HAVE_ZVOL wrappers
|
2009-01-09 11:16:01 -08:00 |
|
Brian Behlendorf
|
86a5af4d25
|
Update HAVE_ZPL bits for zfs_ioctl
|
2009-01-09 11:13:22 -08:00 |
|
Brian Behlendorf
|
469bd888eb
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-09 09:23:30 -08:00 |
|
Brian Behlendorf
|
5a04b50177
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-09 09:23:15 -08:00 |
|
Brian Behlendorf
|
58fe3421b7
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-09 09:22:54 -08:00 |
|
Brian Behlendorf
|
8cd72da031
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-09 09:22:49 -08:00 |
|
Brian Behlendorf
|
8bb10f0528
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-09 09:22:44 -08:00 |
|
Brian Behlendorf
|
00aa3c2f3d
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 09:22:39 -08:00 |
|
Brian Behlendorf
|
62ce4aabc6
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 09:22:33 -08:00 |
|
Brian Behlendorf
|
47f49e3634
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 09:22:33 -08:00 |
|
Brian Behlendorf
|
1a106f9b4e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 09:22:25 -08:00 |
|
Brian Behlendorf
|
ed92da1e4e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 09:22:24 -08:00 |
|
Brian Behlendorf
|
620c143386
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-09 09:21:56 -08:00 |
|
Brian Behlendorf
|
110393189c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-09 09:21:47 -08:00 |
|
Brian Behlendorf
|
a534a8bd1f
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-09 09:21:36 -08:00 |
|
Brian Behlendorf
|
91b9bf3f40
|
Pulling zvol, zfs_vfsops, and zfs_ioctl to resolve those build issues
|
2009-01-09 09:19:33 -08:00 |
|
Brian Behlendorf
|
b573210ad0
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-08 10:28:44 -08:00 |
|
Brian Behlendorf
|
b38c50ac45
|
Update vdev_disk.c implementation to be compatible with b103 API
|
2009-01-08 10:25:23 -08:00 |
|
Brian Behlendorf
|
f1cf255273
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-07 15:53:39 -08:00 |
|
Brian Behlendorf
|
a362b45dc6
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-07 15:53:23 -08:00 |
|
Brian Behlendorf
|
3cffd4f196
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-07 15:53:01 -08:00 |
|
Brian Behlendorf
|
4faa6ff9df
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-07 15:52:56 -08:00 |
|
Brian Behlendorf
|
47f55fd79b
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-07 15:52:51 -08:00 |
|
Brian Behlendorf
|
1aab10f3c8
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-07 15:52:46 -08:00 |
|
Brian Behlendorf
|
1b6dee2506
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-07 15:52:40 -08:00 |
|
Brian Behlendorf
|
fdc9b1d377
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-07 15:52:39 -08:00 |
|
Brian Behlendorf
|
cf6efb2639
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-07 15:52:32 -08:00 |
|
Brian Behlendorf
|
53a6418874
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-07 15:52:31 -08:00 |
|
Brian Behlendorf
|
e24cd3aeee
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-07 15:52:00 -08:00 |
|
Brian Behlendorf
|
1c5ae9851b
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-07 15:51:51 -08:00 |
|
Brian Behlendorf
|
c9ef10893b
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-07 15:51:40 -08:00 |
|
Brian Behlendorf
|
2a76f03369
|
Update distfiles
|
2009-01-07 15:49:36 -08:00 |
|
Brian Behlendorf
|
87313883ac
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-07 15:29:12 -08:00 |
|
Brian Behlendorf
|
12a4048370
|
Enable zfs_create_fs to operate without the VFS
|
2009-01-07 15:26:04 -08:00 |
|
Brian Behlendorf
|
4121b581e9
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-06 13:46:56 -08:00 |
|
Brian Behlendorf
|
d92e9fd833
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-06 13:46:44 -08:00 |
|
Brian Behlendorf
|
0b8e8ad2c4
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-06 13:46:26 -08:00 |
|
Brian Behlendorf
|
d3b387c40c
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-06 13:46:22 -08:00 |
|
Brian Behlendorf
|
29ca9904a1
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-06 13:46:18 -08:00 |
|
Brian Behlendorf
|
7c9a715fdb
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-06 13:46:13 -08:00 |
|
Brian Behlendorf
|
f30cedbaf3
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-06 13:46:09 -08:00 |
|
Brian Behlendorf
|
1420cd5581
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-06 13:46:09 -08:00 |
|
Brian Behlendorf
|
15610133b7
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-06 13:46:03 -08:00 |
|
Brian Behlendorf
|
f01d7c3dba
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-06 13:46:02 -08:00 |
|
Brian Behlendorf
|
4c8c452c4e
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-06 13:45:39 -08:00 |
|
Brian Behlendorf
|
b8cb91a93c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:45:31 -08:00 |
|
Brian Behlendorf
|
108e51fa56
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-06 13:45:29 -08:00 |
|
Brian Behlendorf
|
6280843d13
|
Remove until it can be updated
|
2009-01-06 13:43:53 -08:00 |
|
Brian Behlendorf
|
9bfe14aded
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-06 13:17:37 -08:00 |
|
Brian Behlendorf
|
0e01c13ab4
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-06 13:17:24 -08:00 |
|
Brian Behlendorf
|
791ca841bd
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-06 13:17:06 -08:00 |
|
Brian Behlendorf
|
bf0e564947
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-06 13:17:02 -08:00 |
|
Brian Behlendorf
|
446470c90a
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-06 13:16:58 -08:00 |
|
Brian Behlendorf
|
da6d7ab293
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-06 13:16:53 -08:00 |
|
Brian Behlendorf
|
09a5a916ec
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-06 13:16:49 -08:00 |
|
Brian Behlendorf
|
0e16147946
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-06 13:16:49 -08:00 |
|
Brian Behlendorf
|
5f6f39da9a
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-06 13:16:43 -08:00 |
|
Brian Behlendorf
|
74bff69746
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-06 13:16:42 -08:00 |
|
Brian Behlendorf
|
63e4be5912
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-06 13:16:18 -08:00 |
|
Brian Behlendorf
|
27614e4fe5
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:16:11 -08:00 |
|
Brian Behlendorf
|
ead5766a7a
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-06 13:16:10 -08:00 |
|
Brian Behlendorf
|
f9494f2bb1
|
Build missing sources
|
2009-01-06 13:14:30 -08:00 |
|
Brian Behlendorf
|
d9da5a5c32
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-06 13:01:42 -08:00 |
|
Brian Behlendorf
|
b9b559258c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-06 13:01:38 -08:00 |
|
Brian Behlendorf
|
6842512863
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-06 13:01:37 -08:00 |
|
Brian Behlendorf
|
7acfdabf20
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-06 13:01:32 -08:00 |
|
Brian Behlendorf
|
63c9f3ff72
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-06 13:01:30 -08:00 |
|
Brian Behlendorf
|
57aad95a52
|
Refresh exported symbols
|
2009-01-06 12:59:50 -08:00 |
|
Brian Behlendorf
|
cca384cc3d
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-06 12:36:29 -08:00 |
|
Brian Behlendorf
|
65923b99f9
|
Update to use DS_MODE_USER not removed DS_MODE_STANDARD
|
2009-01-06 12:32:44 -08:00 |
|
Brian Behlendorf
|
31781c93df
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-06 11:38:37 -08:00 |
|
Brian Behlendorf
|
a6dba6330c
|
Add missing include paths
|
2009-01-06 11:36:56 -08:00 |
|
Brian Behlendorf
|
d000467b7f
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-06 11:04:16 -08:00 |
|
Brian Behlendorf
|
fa03d4582f
|
Remove circular dependency
|
2009-01-06 11:02:36 -08:00 |
|
Brian Behlendorf
|
608b2dd1c0
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:57:22 -08:00 |
|
Brian Behlendorf
|
d785c6d77a
|
Should use zpios not kpios
|
2009-01-06 09:55:40 -08:00 |
|
Brian Behlendorf
|
280aa071b5
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-06 09:40:35 -08:00 |
|
Brian Behlendorf
|
461db1ecc9
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-06 09:40:31 -08:00 |
|
Brian Behlendorf
|
889a81fcf2
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-06 09:40:30 -08:00 |
|
Brian Behlendorf
|
81ec019880
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:40:26 -08:00 |
|
Brian Behlendorf
|
5bd66364e9
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-06 09:40:24 -08:00 |
|
Brian Behlendorf
|
da647d38a3
|
Refresh exported symbols, remove zio_resume_threads as out of date
|
2009-01-06 09:38:39 -08:00 |
|
Brian Behlendorf
|
5c2ffdd137
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-06 09:31:24 -08:00 |
|
Brian Behlendorf
|
1203be7caa
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-06 09:31:11 -08:00 |
|
Brian Behlendorf
|
61032f1ce6
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-06 09:30:54 -08:00 |
|
Brian Behlendorf
|
37555b8fe3
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-06 09:30:49 -08:00 |
|
Brian Behlendorf
|
7d73a17e54
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-06 09:30:45 -08:00 |
|
Brian Behlendorf
|
03a7b3761b
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-06 09:30:41 -08:00 |
|
Brian Behlendorf
|
ac63920b2c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-06 09:30:36 -08:00 |
|
Brian Behlendorf
|
abca9d8b9a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-06 09:30:36 -08:00 |
|
Brian Behlendorf
|
82458be35a
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-06 09:30:30 -08:00 |
|
Brian Behlendorf
|
bc820e95a6
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-06 09:30:29 -08:00 |
|
Brian Behlendorf
|
4adeb6cd65
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-06 09:30:06 -08:00 |
|
Brian Behlendorf
|
2da97a44c2
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:29:59 -08:00 |
|
Brian Behlendorf
|
ea60914948
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-06 09:29:57 -08:00 |
|
Brian Behlendorf
|
5f9b0590f5
|
Remove zfs_fuid for now from kernel source until needed by ZPL
|
2009-01-06 09:28:09 -08:00 |
|
Brian Behlendorf
|
3c6c265b92
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-06 09:16:21 -08:00 |
|
Brian Behlendorf
|
f6f3c46840
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-06 09:16:17 -08:00 |
|
Brian Behlendorf
|
e4a4ad147a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-06 09:16:16 -08:00 |
|
Brian Behlendorf
|
cc40d91977
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:16:12 -08:00 |
|
Brian Behlendorf
|
a9361a459e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-06 09:16:10 -08:00 |
|
Brian Behlendorf
|
d71643eb94
|
Refresh exported symbols
|
2009-01-06 09:14:10 -08:00 |
|
Brian Behlendorf
|
574f1ecfec
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-06 09:03:57 -08:00 |
|
Brian Behlendorf
|
43e4426b34
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-06 09:03:52 -08:00 |
|
Brian Behlendorf
|
b521002205
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-06 09:03:51 -08:00 |
|
Brian Behlendorf
|
3013823bbe
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-06 09:03:44 -08:00 |
|
Brian Behlendorf
|
bb6a56e778
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-06 09:03:39 -08:00 |
|
Brian Behlendorf
|
1c496f0235
|
Refresh exported spa_config symbols
|
2009-01-06 08:59:36 -08:00 |
|
Brian Behlendorf
|
3e9ecdb05d
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-06 08:44:14 -08:00 |
|
Brian Behlendorf
|
4522c570e8
|
Add missing prototype
|
2009-01-06 08:39:45 -08:00 |
|
Brian Behlendorf
|
37fbec5b71
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:59:36 -08:00 |
|
Brian Behlendorf
|
554e66717b
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 16:59:30 -08:00 |
|
Brian Behlendorf
|
3edbae3a2d
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 16:59:20 -08:00 |
|
Brian Behlendorf
|
7feda9d67d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 16:59:18 -08:00 |
|
Brian Behlendorf
|
23ea9e6a3a
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:59:07 -08:00 |
|
Brian Behlendorf
|
e7f04030d2
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 16:59:02 -08:00 |
|
Brian Behlendorf
|
90ff526841
|
Remove symbol exports no longer needed with the dsl scrub rewrite
|
2009-01-05 16:55:15 -08:00 |
|
Brian Behlendorf
|
3a1f0dcde1
|
Refresh prototype due to upstream changes
|
2009-01-05 16:53:23 -08:00 |
|
Brian Behlendorf
|
ec5f706c33
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-05 16:41:42 -08:00 |
|
Brian Behlendorf
|
e3bb3d635d
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-05 16:41:09 -08:00 |
|
Brian Behlendorf
|
fd4be9bb6e
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-05 16:40:26 -08:00 |
|
Brian Behlendorf
|
ef1c43e66f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-05 16:40:14 -08:00 |
|
Brian Behlendorf
|
8c5d486797
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-05 16:40:03 -08:00 |
|
Brian Behlendorf
|
3283dd9715
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 16:39:54 -08:00 |
|
Brian Behlendorf
|
4f8a8bc8da
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 16:39:44 -08:00 |
|
Brian Behlendorf
|
7b1eb5d131
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 16:39:42 -08:00 |
|
Brian Behlendorf
|
a4d96d5c16
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 16:39:28 -08:00 |
|
Brian Behlendorf
|
d763974558
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 16:39:26 -08:00 |
|
Brian Behlendorf
|
f7ba355478
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-05 16:38:29 -08:00 |
|
Brian Behlendorf
|
4d6969d387
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:38:12 -08:00 |
|
Brian Behlendorf
|
c92ab39541
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-05 16:38:08 -08:00 |
|
Brian Behlendorf
|
9d4d588938
|
Comment out until ZPL implemented
|
2009-01-05 16:34:01 -08:00 |
|
Brian Behlendorf
|
163d99cd44
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 16:00:47 -08:00 |
|
Brian Behlendorf
|
2800480736
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 16:00:42 -08:00 |
|
Brian Behlendorf
|
867b188b30
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 16:00:41 -08:00 |
|
Brian Behlendorf
|
154d07bd96
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 16:00:36 -08:00 |
|
Brian Behlendorf
|
995a374126
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 16:00:32 -08:00 |
|
Brian Behlendorf
|
76d40e2e81
|
Update exported symbols
|
2009-01-05 15:58:50 -08:00 |
|
Brian Behlendorf
|
ce50f2053c
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-05 15:45:59 -08:00 |
|
Brian Behlendorf
|
24565e3301
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-05 15:45:46 -08:00 |
|
Brian Behlendorf
|
62a048b3a1
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-05 15:45:29 -08:00 |
|
Brian Behlendorf
|
bb747a10de
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-05 15:45:25 -08:00 |
|
Brian Behlendorf
|
67c9f22507
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-05 15:45:21 -08:00 |
|
Brian Behlendorf
|
407eef59dd
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 15:45:17 -08:00 |
|
Brian Behlendorf
|
a9c201e00f
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 15:45:13 -08:00 |
|
Brian Behlendorf
|
ef0cd2992f
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 15:45:12 -08:00 |
|
Brian Behlendorf
|
f3eeb1c19b
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:45:07 -08:00 |
|
Brian Behlendorf
|
dbc3840c65
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 15:45:06 -08:00 |
|
Brian Behlendorf
|
b2db87f254
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 15:45:05 -08:00 |
|
Brian Behlendorf
|
037a076160
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-05 15:44:42 -08:00 |
|
Brian Behlendorf
|
4b9683dcf7
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:44:35 -08:00 |
|
Brian Behlendorf
|
7c992011a1
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-05 15:44:33 -08:00 |
|
Brian Behlendorf
|
760d78b9f8
|
Move default include paths after custom include paths so local stuff gets picked up first
|
2009-01-05 15:42:56 -08:00 |
|
Brian Behlendorf
|
4c741b2f9d
|
Revert changes and resolve include issue by adjusting include path ordering
|
2009-01-05 15:40:56 -08:00 |
|
Brian Behlendorf
|
d28280dd17
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 15:21:24 -08:00 |
|
Brian Behlendorf
|
bb4ca885b5
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 15:21:19 -08:00 |
|
Brian Behlendorf
|
5b2b7fc3df
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 15:21:19 -08:00 |
|
Brian Behlendorf
|
96989f8b00
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:21:14 -08:00 |
|
Brian Behlendorf
|
ab0b7157d5
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 15:21:12 -08:00 |
|
Brian Behlendorf
|
eb58273a29
|
Update exported symbol names for new traversal code
|
2009-01-05 15:19:35 -08:00 |
|
Brian Behlendorf
|
bd81e10fbf
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-05 14:29:27 -08:00 |
|
Brian Behlendorf
|
e85775aeaa
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-05 14:29:14 -08:00 |
|
Brian Behlendorf
|
c80dcc2dc1
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-05 14:28:57 -08:00 |
|
Brian Behlendorf
|
a1dc943c32
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-05 14:28:53 -08:00 |
|
Brian Behlendorf
|
c31e0e9e89
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-05 14:28:49 -08:00 |
|
Brian Behlendorf
|
48fa5d6c8f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 14:28:44 -08:00 |
|
Brian Behlendorf
|
74245215c4
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 14:28:40 -08:00 |
|
Brian Behlendorf
|
d1c8781815
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 14:28:39 -08:00 |
|
Brian Behlendorf
|
86a7a82c2d
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 14:28:34 -08:00 |
|
Brian Behlendorf
|
ec462ce48f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 14:28:33 -08:00 |
|
Brian Behlendorf
|
1757c77c88
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-05 14:28:10 -08:00 |
|
Brian Behlendorf
|
79a46ae86d
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:28:02 -08:00 |
|
Brian Behlendorf
|
1ab1e16285
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-05 14:28:01 -08:00 |
|
Brian Behlendorf
|
a4ecacdad7
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-05 14:28:00 -08:00 |
|
Brian Behlendorf
|
93e72d1102
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-05 14:27:59 -08:00 |
|
Brian Behlendorf
|
854fda6d70
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2009-01-05 14:27:58 -08:00 |
|
Brian Behlendorf
|
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 |
|
Brian Behlendorf
|
fcacccfb25
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 14:13:59 -08:00 |
|
Brian Behlendorf
|
a94bfe5a2d
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 14:13:55 -08:00 |
|
Brian Behlendorf
|
743a2a757f
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 14:13:54 -08:00 |
|
Brian Behlendorf
|
e25fab9985
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 14:13:50 -08:00 |
|
Brian Behlendorf
|
2ec61316a8
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 14:13:48 -08:00 |
|
Brian Behlendorf
|
d8f9597730
|
Always include u8_textprep
|
2009-01-05 14:12:03 -08:00 |
|
Brian Behlendorf
|
6efd309371
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 13:59:14 -08:00 |
|
Brian Behlendorf
|
2dddcca89a
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 13:59:10 -08:00 |
|
Brian Behlendorf
|
4e41051097
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 13:59:09 -08:00 |
|
Brian Behlendorf
|
49e679bb6d
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 13:59:05 -08:00 |
|
Brian Behlendorf
|
90531ed597
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 13:59:03 -08:00 |
|
Brian Behlendorf
|
0c9de0c356
|
Linux kernel modularize unicode
|
2009-01-05 13:57:26 -08:00 |
|
Brian Behlendorf
|
35cfc1bb85
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-05 12:45:38 -08:00 |
|
Brian Behlendorf
|
0e00972b2a
|
Resolve conflict
|
2009-01-05 12:42:30 -08:00 |
|
Brian Behlendorf
|
9c73332e81
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-05 12:41:15 -08:00 |
|
Brian Behlendorf
|
144eca0e84
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-05 12:41:04 -08:00 |
|
Brian Behlendorf
|
d5350109f4
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-05 12:40:55 -08:00 |
|
Brian Behlendorf
|
6ce317a8d5
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 12:40:48 -08:00 |
|
Brian Behlendorf
|
1751caa615
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 12:40:38 -08:00 |
|
Brian Behlendorf
|
5d49f45c50
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 12:40:37 -08:00 |
|
Brian Behlendorf
|
1dd185c19d
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 12:40:26 -08:00 |
|
Brian Behlendorf
|
9c2bf69ecb
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 12:40:25 -08:00 |
|
Brian Behlendorf
|
fe1e3df517
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-05 12:39:39 -08:00 |
|
Brian Behlendorf
|
9a0cb95b1b
|
Resolve conflict
|
2009-01-05 12:38:23 -08:00 |
|
Brian Behlendorf
|
9e7be26939
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-05 12:36:21 -08:00 |
|
Brian Behlendorf
|
ce7115b807
|
Add unicode makefile references and support
|
2009-01-05 12:33:09 -08:00 |
|
Brian Behlendorf
|
ced77c2f1b
|
Add unicode makefile references and support
|
2009-01-05 12:32:55 -08:00 |
|
Brian Behlendorf
|
7a14126594
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-05 12:13:07 -08:00 |
|
Brian Behlendorf
|
ddcdf90ceb
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-05 12:12:33 -08:00 |
|
Brian Behlendorf
|
774375d168
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-05 12:11:47 -08:00 |
|
Brian Behlendorf
|
bde3267f84
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-05 12:11:36 -08:00 |
|
Brian Behlendorf
|
cd566dec4e
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-05 12:11:24 -08:00 |
|
Brian Behlendorf
|
3ee9de49fe
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 12:11:12 -08:00 |
|
Brian Behlendorf
|
61f28b82f0
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 12:11:00 -08:00 |
|
Brian Behlendorf
|
dee2ae81f9
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 12:10:58 -08:00 |
|
Brian Behlendorf
|
c7907319d9
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 12:10:40 -08:00 |
|
Brian Behlendorf
|
1c1ec8cce6
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 12:10:37 -08:00 |
|
Brian Behlendorf
|
de4e3d5d4e
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-05 12:09:34 -08:00 |
|
Brian Behlendorf
|
888028c161
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:09:13 -08:00 |
|
Brian Behlendorf
|
321bc5b04a
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-05 12:09:09 -08:00 |
|
Brian Behlendorf
|
07c6176130
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-05 12:09:06 -08:00 |
|
Brian Behlendorf
|
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 |
|
Brian Behlendorf
|
9e12900ee7
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2009-01-05 12:08:50 -08:00 |
|
Brian Behlendorf
|
c239bd53d2
|
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
|
2009-01-05 12:08:46 -08:00 |
|
Brian Behlendorf
|
65520ad8fd
|
Merge commit 'refs/top-bases/fix-locks' into fix-locks
|
2009-01-05 12:08:36 -08:00 |
|
Brian Behlendorf
|
1bee6d83ae
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2009-01-05 12:08:23 -08:00 |
|
Brian Behlendorf
|
674ed5bd02
|
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
|
2009-01-05 12:08:18 -08:00 |
|
Brian Behlendorf
|
91daa17079
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2009-01-05 12:08:16 -08:00 |
|
Brian Behlendorf
|
39b3a6a12d
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-05 12:08:11 -08:00 |
|
Brian Behlendorf
|
600c6efdab
|
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
|
2009-01-05 12:08:07 -08:00 |
|
Brian Behlendorf
|
358ebaae5a
|
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
|
2009-01-05 12:08:02 -08:00 |
|
Brian Behlendorf
|
a22f3a712d
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2009-01-05 12:07:58 -08:00 |
|
Brian Behlendorf
|
a55b0f2c1b
|
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
|
2009-01-05 12:07:53 -08:00 |
|
Brian Behlendorf
|
d09ef994e7
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2009-01-05 12:07:48 -08:00 |
|
Brian Behlendorf
|
5a7a00f67c
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2009-01-05 12:07:30 -08:00 |
|
Brian Behlendorf
|
7d4ccef58f
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-05 12:07:27 -08:00 |
|
Brian Behlendorf
|
cdfd10ba79
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2009-01-05 12:07:25 -08:00 |
|
Brian Behlendorf
|
42bcb36c89
|
Add unicode library
|
2009-01-05 12:03:23 -08:00 |
|
Brian Behlendorf
|
9d827ae691
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-23 16:36:37 -08:00 |
|
Brian Behlendorf
|
ae960c7bbc
|
This doesn't quite work with the SPL yet
|
2008-12-23 16:32:42 -08:00 |
|
Brian Behlendorf
|
4dc3268de4
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-23 16:13:36 -08:00 |
|
Brian Behlendorf
|
cb740a3631
|
Linux ARC integration unimplemented
|
2008-12-23 16:09:45 -08:00 |
|
Brian Behlendorf
|
99c1689f45
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-23 13:50:46 -08:00 |
|
Brian Behlendorf
|
4a0b1e550a
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-23 13:50:31 -08:00 |
|
Brian Behlendorf
|
191a41a5fc
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-23 13:50:13 -08:00 |
|
Brian Behlendorf
|
6f596265c6
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-23 13:50:08 -08:00 |
|
Brian Behlendorf
|
55dd786189
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-23 13:50:03 -08:00 |
|
Brian Behlendorf
|
1786fcf52f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-23 13:49:59 -08:00 |
|
Brian Behlendorf
|
d92640af02
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:49:56 -08:00 |
|
Brian Behlendorf
|
0a963fa1b8
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-23 13:49:54 -08:00 |
|
Brian Behlendorf
|
6b88c17a8f
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-23 13:49:54 -08:00 |
|
Brian Behlendorf
|
8d0db59e56
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-23 13:49:47 -08:00 |
|
Brian Behlendorf
|
39953e7eb3
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-23 13:49:47 -08:00 |
|
Brian Behlendorf
|
df4f48d419
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-23 13:49:22 -08:00 |
|
Brian Behlendorf
|
b491d69122
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:49:15 -08:00 |
|
Brian Behlendorf
|
ffb8773241
|
Take out page map functions for now
|
2008-12-23 13:47:22 -08:00 |
|
Brian Behlendorf
|
de6b729e33
|
Add Makefile tweak
|
2008-12-23 13:44:15 -08:00 |
|
Brian Behlendorf
|
5c0c083ad9
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-23 13:14:27 -08:00 |
|
Brian Behlendorf
|
ad75ceca9b
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-23 13:14:13 -08:00 |
|
Brian Behlendorf
|
279819e449
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-23 13:13:55 -08:00 |
|
Brian Behlendorf
|
c2f93a61e2
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-23 13:13:51 -08:00 |
|
Brian Behlendorf
|
7539a5da86
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-23 13:13:46 -08:00 |
|
Brian Behlendorf
|
30c88a0708
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-23 13:13:42 -08:00 |
|
Brian Behlendorf
|
4177b4715d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-23 13:13:37 -08:00 |
|
Brian Behlendorf
|
642a64b7bd
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-23 13:13:37 -08:00 |
|
Brian Behlendorf
|
028f170442
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:13:32 -08:00 |
|
Brian Behlendorf
|
57048fa6fa
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-23 13:13:30 -08:00 |
|
Brian Behlendorf
|
f49886c003
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-23 13:13:29 -08:00 |
|
Brian Behlendorf
|
793aa1f026
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-23 13:13:04 -08:00 |
|
Brian Behlendorf
|
e601754f7c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-23 13:12:57 -08:00 |
|
Brian Behlendorf
|
7725fe7431
|
Remove CPU_SEQID from context, available in SPL. Additionally add module magic for zcommon
|
2008-12-23 13:11:03 -08:00 |
|
Brian Behlendorf
|
e7e0111a7c
|
Update makefile
|
2008-12-23 13:07:27 -08:00 |
|
Brian Behlendorf
|
fe5632dac0
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-23 12:51:59 -08:00 |
|
Brian Behlendorf
|
2b8a76731b
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-23 12:51:45 -08:00 |
|
Brian Behlendorf
|
a4753a3459
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-23 12:51:26 -08:00 |
|
Brian Behlendorf
|
971e4cca83
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-23 12:51:21 -08:00 |
|
Brian Behlendorf
|
ef8ca905d2
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-23 12:51:16 -08:00 |
|
Brian Behlendorf
|
c8a87608d6
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-23 12:51:12 -08:00 |
|
Brian Behlendorf
|
b4c584906e
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-23 12:51:07 -08:00 |
|
Brian Behlendorf
|
9b3e361b6e
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-23 12:51:06 -08:00 |
|
Brian Behlendorf
|
1d4f536ffd
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-23 12:50:59 -08:00 |
|
Brian Behlendorf
|
c22ff325ce
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-23 12:50:58 -08:00 |
|
Brian Behlendorf
|
a0451d884a
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-23 12:50:32 -08:00 |
|
Brian Behlendorf
|
13dd1298b6
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-23 12:50:24 -08:00 |
|
Brian Behlendorf
|
0dfd5ebee8
|
module/zcommon/Makefile.in
|
2008-12-23 12:47:03 -08:00 |
|
Brian Behlendorf
|
72ad2bab17
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-23 11:50:57 -08:00 |
|
Brian Behlendorf
|
d1e7610b2c
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-23 11:50:43 -08:00 |
|
Brian Behlendorf
|
67d2cff1ac
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-23 11:50:24 -08:00 |
|
Brian Behlendorf
|
4f98a245f4
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-23 11:50:19 -08:00 |
|
Brian Behlendorf
|
5fe9881ef0
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-23 11:50:15 -08:00 |
|
Brian Behlendorf
|
7c6d905ec3
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-23 11:50:11 -08:00 |
|
Brian Behlendorf
|
1431c8e452
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-23 11:50:06 -08:00 |
|
Brian Behlendorf
|
8209bef3af
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-23 11:50:05 -08:00 |
|
Brian Behlendorf
|
ce950dd29f
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-23 11:49:59 -08:00 |
|
Brian Behlendorf
|
82cd3659a2
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-23 11:49:58 -08:00 |
|
Brian Behlendorf
|
de2b1e9189
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-23 11:49:34 -08:00 |
|
Brian Behlendorf
|
c95e9a8ce0
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-23 11:49:27 -08:00 |
|
Brian Behlendorf
|
5a0a9cc451
|
Update makefiles
|
2008-12-23 11:47:33 -08:00 |
|
Brian Behlendorf
|
4230c743cd
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-23 09:26:10 -08:00 |
|
Brian Behlendorf
|
fe119cee57
|
Minor zpios cleanup
|
2008-12-23 09:24:19 -08:00 |
|
Brian Behlendorf
|
f058190402
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-22 14:54:13 -08:00 |
|
Brian Behlendorf
|
b7217f525f
|
Fix typo
|
2008-12-22 14:52:15 -08:00 |
|
Brian Behlendorf
|
9de781cf03
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:53:04 -08:00 |
|
Brian Behlendorf
|
139792e6b2
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2008-12-22 13:53:03 -08:00 |
|
Brian Behlendorf
|
bb12ee3ba5
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 13:52:47 -08:00 |
|
Brian Behlendorf
|
6157e981b3
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-22 13:52:26 -08:00 |
|
Brian Behlendorf
|
ddb72e5a3d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-22 13:52:21 -08:00 |
|
Brian Behlendorf
|
262e367cd5
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 13:52:16 -08:00 |
|
Brian Behlendorf
|
877699acb1
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 13:52:11 -08:00 |
|
Brian Behlendorf
|
8f69262e09
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 13:52:06 -08:00 |
|
Brian Behlendorf
|
c93aec7f64
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 13:52:05 -08:00 |
|
Brian Behlendorf
|
ca2b6db925
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 13:51:58 -08:00 |
|
Brian Behlendorf
|
1f72057409
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 13:51:57 -08:00 |
|
Brian Behlendorf
|
3348038cc6
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-22 13:51:29 -08:00 |
|
Brian Behlendorf
|
05fafc638f
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:51:21 -08:00 |
|
Brian Behlendorf
|
90e5216ea9
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-22 13:51:17 -08:00 |
|
Brian Behlendorf
|
3b93dc4d82
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-22 13:51:14 -08:00 |
|
Brian Behlendorf
|
3a953fa870
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-22 13:51:13 -08:00 |
|
Brian Behlendorf
|
d684390d3a
|
Just fix a bogus return type
|
2008-12-22 13:49:15 -08:00 |
|
Brian Behlendorf
|
f41626ced6
|
Make ZPL conditional
|
2008-12-22 13:46:30 -08:00 |
|
Brian Behlendorf
|
9d731b801b
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:35:15 -08:00 |
|
Brian Behlendorf
|
f046fb3552
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:35:14 -08:00 |
|
Brian Behlendorf
|
3f5f22eab0
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 13:35:12 -08:00 |
|
Brian Behlendorf
|
a9058c38b3
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 13:35:07 -08:00 |
|
Brian Behlendorf
|
9bfe4e627a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 13:35:06 -08:00 |
|
Brian Behlendorf
|
973d4f36ef
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 13:35:01 -08:00 |
|
Brian Behlendorf
|
3cdde7ffd9
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 13:34:59 -08:00 |
|
Brian Behlendorf
|
46badfb03b
|
Only allow this for the kernel
|
2008-12-22 13:33:06 -08:00 |
|
Brian Behlendorf
|
b17c1f4123
|
Don't make this fatal for userspace
|
2008-12-22 13:32:19 -08:00 |
|
Brian Behlendorf
|
05b4b092dc
|
Only required for ZPL builds
|
2008-12-22 13:31:23 -08:00 |
|
Brian Behlendorf
|
bf10d5037a
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:42:04 -08:00 |
|
Brian Behlendorf
|
2f4b12b228
|
Add HAVE_ZVOL changes
|
2008-12-22 12:37:43 -08:00 |
|
Brian Behlendorf
|
1e9c6b3020
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:24:47 -08:00 |
|
Brian Behlendorf
|
79491b69f4
|
Start linux-have-zpl layer
|
2008-12-22 12:23:27 -08:00 |
|
Brian Behlendorf
|
a6d6f31db6
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 12:09:08 -08:00 |
|
Brian Behlendorf
|
d7d260b870
|
Removing branch to readd under new name
|
2008-12-22 12:05:11 -08:00 |
|
Brian Behlendorf
|
3533b7ec8c
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:58:27 -08:00 |
|
Brian Behlendorf
|
683dc8d98e
|
Fix up headers
|
2008-12-22 11:54:35 -08:00 |
|
Brian Behlendorf
|
9a57b35c98
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 11:42:18 -08:00 |
|
Brian Behlendorf
|
f752d29d6c
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-22 11:41:59 -08:00 |
|
Brian Behlendorf
|
52a84a3394
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-22 11:41:54 -08:00 |
|
Brian Behlendorf
|
7b4bf789e9
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-22 11:41:50 -08:00 |
|
Brian Behlendorf
|
6d13a998fb
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 11:41:45 -08:00 |
|
Brian Behlendorf
|
86392b70ad
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 11:41:40 -08:00 |
|
Brian Behlendorf
|
b49ce65660
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 11:41:35 -08:00 |
|
Brian Behlendorf
|
fa9a05e496
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 11:41:35 -08:00 |
|
Brian Behlendorf
|
f9e9bba2a4
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 11:41:28 -08:00 |
|
Brian Behlendorf
|
187be3051e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 11:41:27 -08:00 |
|
Brian Behlendorf
|
ed1931c363
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-22 11:41:01 -08:00 |
|
Brian Behlendorf
|
aece7f6822
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:40:54 -08:00 |
|
Brian Behlendorf
|
7047bb0678
|
Add missing files from Makefile.am
|
2008-12-22 11:36:48 -08:00 |
|
Brian Behlendorf
|
94dac841b6
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 11:08:29 -08:00 |
|
Brian Behlendorf
|
72f9288f09
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 11:08:24 -08:00 |
|
Brian Behlendorf
|
d51e1b0eeb
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 11:08:23 -08:00 |
|
Brian Behlendorf
|
90ed9826ab
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-22 11:08:18 -08:00 |
|
Brian Behlendorf
|
22f583b0f5
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 11:08:17 -08:00 |
|
Brian Behlendorf
|
09de417e20
|
Move #endif up to expose userspace bits
|
2008-12-22 11:01:35 -08:00 |
|
Brian Behlendorf
|
c73c225a4a
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-22 10:37:37 -08:00 |
|
Brian Behlendorf
|
edaabab594
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-22 10:37:19 -08:00 |
|
Brian Behlendorf
|
8126ebe55f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-22 10:37:14 -08:00 |
|
Brian Behlendorf
|
8ad9104988
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-22 10:37:10 -08:00 |
|
Brian Behlendorf
|
5169758856
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-22 10:37:05 -08:00 |
|
Brian Behlendorf
|
c6e93310af
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-22 10:37:00 -08:00 |
|
Brian Behlendorf
|
ba2c349faf
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-22 10:36:56 -08:00 |
|
Brian Behlendorf
|
e0141c82aa
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-22 10:36:55 -08:00 |
|
Brian Behlendorf
|
6a981c09a5
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-22 10:36:49 -08:00 |
|
Brian Behlendorf
|
bdbd91fe46
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-22 10:36:48 -08:00 |
|
Brian Behlendorf
|
f7d9583ab8
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-22 10:36:23 -08:00 |
|
Brian Behlendorf
|
9c47372b96
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-22 10:36:15 -08:00 |
|
Brian Behlendorf
|
10911f9d71
|
Add missing sources
|
2008-12-22 10:27:41 -08:00 |
|
Brian Behlendorf
|
fc1b3ca740
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 16:35:53 -08:00 |
|
Brian Behlendorf
|
dad4dd0dd4
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-19 16:35:17 -08:00 |
|
Brian Behlendorf
|
15e778a05c
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-19 16:35:07 -08:00 |
|
Brian Behlendorf
|
8806156f06
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 16:34:57 -08:00 |
|
Brian Behlendorf
|
6fdfd55847
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 16:34:48 -08:00 |
|
Brian Behlendorf
|
3f0c49cfa4
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 16:34:38 -08:00 |
|
Brian Behlendorf
|
07bc9c667e
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 16:34:28 -08:00 |
|
Brian Behlendorf
|
f7b6b1c5c1
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 16:34:27 -08:00 |
|
Brian Behlendorf
|
f677f67130
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-19 16:34:12 -08:00 |
|
Brian Behlendorf
|
cbc70456f1
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 16:34:10 -08:00 |
|
Brian Behlendorf
|
a8075f7528
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-19 16:33:19 -08:00 |
|
Brian Behlendorf
|
809ca413e5
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:33:03 -08:00 |
|
Brian Behlendorf
|
96813619bf
|
Pull in new background scrubber
|
2008-12-19 16:29:13 -08:00 |
|
Brian Behlendorf
|
6fbf894ec8
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 13:48:40 -08:00 |
|
Brian Behlendorf
|
1fbab90849
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-19 13:48:23 -08:00 |
|
Brian Behlendorf
|
3aa09f9e0d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-19 13:48:18 -08:00 |
|
Brian Behlendorf
|
8006f3c239
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 13:48:14 -08:00 |
|
Brian Behlendorf
|
99a14f150c
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 13:48:10 -08:00 |
|
Brian Behlendorf
|
6f272feaa8
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 13:48:05 -08:00 |
|
Brian Behlendorf
|
f935667824
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 13:48:01 -08:00 |
|
Brian Behlendorf
|
5ae92c2a3c
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 13:48:00 -08:00 |
|
Brian Behlendorf
|
36f6317537
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-19 13:47:54 -08:00 |
|
Brian Behlendorf
|
5cd3d5fe3f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 13:47:53 -08:00 |
|
Brian Behlendorf
|
587a8224e2
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-19 13:47:29 -08:00 |
|
Brian Behlendorf
|
fd7ac68c8c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 13:47:22 -08:00 |
|
Brian Behlendorf
|
1b2a1a31bb
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 13:47:20 -08:00 |
|
Brian Behlendorf
|
b5e4bf3731
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 13:47:19 -08:00 |
|
Brian Behlendorf
|
8161b781a1
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 13:47:18 -08:00 |
|
Brian Behlendorf
|
89bd2100e7
|
Resolve a few more c90 issues
|
2008-12-19 13:45:24 -08:00 |
|
Brian Behlendorf
|
818edba02c
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-19 13:38:22 -08:00 |
|
Brian Behlendorf
|
add6c31eed
|
Update vdev_disk for in-kernel use
|
2008-12-19 13:34:38 -08:00 |
|
Brian Behlendorf
|
b3fafb4b75
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 12:39:52 -08:00 |
|
Brian Behlendorf
|
4daafd6f1e
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-19 12:39:21 -08:00 |
|
Brian Behlendorf
|
385cabaff9
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-19 12:39:11 -08:00 |
|
Brian Behlendorf
|
ca5b279dc4
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 12:39:02 -08:00 |
|
Brian Behlendorf
|
3406c35fda
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 12:38:55 -08:00 |
|
Brian Behlendorf
|
df4782cf3b
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 12:38:48 -08:00 |
|
Brian Behlendorf
|
d6bcad3544
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 12:38:40 -08:00 |
|
Brian Behlendorf
|
f53179120a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 12:38:39 -08:00 |
|
Brian Behlendorf
|
2b99cc1a0d
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-19 12:38:27 -08:00 |
|
Brian Behlendorf
|
5f5a7707b5
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 12:38:25 -08:00 |
|
Brian Behlendorf
|
7738d0c83d
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-19 12:37:38 -08:00 |
|
Brian Behlendorf
|
c2d9428f4c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 12:37:22 -08:00 |
|
Brian Behlendorf
|
97818e5e2b
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 12:37:17 -08:00 |
|
Brian Behlendorf
|
459f1388ba
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 12:37:15 -08:00 |
|
Brian Behlendorf
|
87810a7c8b
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 12:37:13 -08:00 |
|
Brian Behlendorf
|
93a6c0b0b9
|
Fix c90 for() issue
|
2008-12-19 12:33:22 -08:00 |
|
Brian Behlendorf
|
01a745ee24
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 11:07:14 -08:00 |
|
Brian Behlendorf
|
390137732f
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-19 11:06:56 -08:00 |
|
Brian Behlendorf
|
a8e7c21ad7
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-19 11:06:51 -08:00 |
|
Brian Behlendorf
|
b2bf7106ed
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 11:06:46 -08:00 |
|
Brian Behlendorf
|
eeccfec33b
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 11:06:42 -08:00 |
|
Brian Behlendorf
|
8de27ace20
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 11:06:38 -08:00 |
|
Brian Behlendorf
|
d5b0e2f5f8
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 11:06:33 -08:00 |
|
Brian Behlendorf
|
f9e908db67
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 11:06:32 -08:00 |
|
Brian Behlendorf
|
f39f71b60c
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-19 11:06:26 -08:00 |
|
Brian Behlendorf
|
e5a6ed971b
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 11:06:25 -08:00 |
|
Brian Behlendorf
|
d32b761adb
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-19 11:06:00 -08:00 |
|
Brian Behlendorf
|
e461d277b9
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 11:05:52 -08:00 |
|
Brian Behlendorf
|
cc92d6497b
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 11:05:49 -08:00 |
|
Brian Behlendorf
|
d67cf69e08
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 11:05:49 -08:00 |
|
Brian Behlendorf
|
893a49fa9a
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 11:05:48 -08:00 |
|
Brian Behlendorf
|
9041f66bad
|
Fix all instances of for (int i;;) {} that were easily found
|
2008-12-19 11:03:54 -08:00 |
|
Brian Behlendorf
|
70a97750bc
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 10:51:30 -08:00 |
|
Brian Behlendorf
|
e79a0861ce
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-19 10:51:12 -08:00 |
|
Brian Behlendorf
|
0938ee26f9
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-19 10:51:08 -08:00 |
|
Brian Behlendorf
|
de6a384c50
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:51:05 -08:00 |
|
Brian Behlendorf
|
525a682d4d
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 10:51:03 -08:00 |
|
Brian Behlendorf
|
91523abfb0
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 10:50:59 -08:00 |
|
Brian Behlendorf
|
f35afdefda
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 10:50:54 -08:00 |
|
Brian Behlendorf
|
38712a11db
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 10:50:50 -08:00 |
|
Brian Behlendorf
|
25585a1884
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 10:50:49 -08:00 |
|
Brian Behlendorf
|
870c514108
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-19 10:50:43 -08:00 |
|
Brian Behlendorf
|
4f5a560334
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 10:50:42 -08:00 |
|
Brian Behlendorf
|
9f07edfa17
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-19 10:50:18 -08:00 |
|
Brian Behlendorf
|
d5eedbcd00
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:50:11 -08:00 |
|
Brian Behlendorf
|
1db27e736e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 10:50:09 -08:00 |
|
Brian Behlendorf
|
ead0ea6da5
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 10:50:09 -08:00 |
|
Brian Behlendorf
|
d9b08ad01f
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 10:50:08 -08:00 |
|
Brian Behlendorf
|
66e0d59024
|
Whoops, add missing j
|
2008-12-19 10:48:11 -08:00 |
|
Brian Behlendorf
|
3f0ec06d17
|
Remove chunk from spa_import_common, readd
|
2008-12-19 10:45:59 -08:00 |
|
Brian Behlendorf
|
3d7c44a3de
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 10:37:52 -08:00 |
|
Brian Behlendorf
|
dcd93a91a5
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-19 10:37:35 -08:00 |
|
Brian Behlendorf
|
023d652154
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-19 10:37:31 -08:00 |
|
Brian Behlendorf
|
380a9bcd88
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 10:37:26 -08:00 |
|
Brian Behlendorf
|
32d62a53f4
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 10:37:22 -08:00 |
|
Brian Behlendorf
|
b390664792
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 10:37:18 -08:00 |
|
Brian Behlendorf
|
7532b57352
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 10:37:14 -08:00 |
|
Brian Behlendorf
|
fd01bfe6b1
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 10:37:13 -08:00 |
|
Brian Behlendorf
|
afacc36f29
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-19 10:37:07 -08:00 |
|
Brian Behlendorf
|
01f8dc1f20
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 10:37:06 -08:00 |
|
Brian Behlendorf
|
1c1fa92ef6
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-19 10:36:43 -08:00 |
|
Brian Behlendorf
|
b6865ac44a
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:36:36 -08:00 |
|
Brian Behlendorf
|
76247cc21d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 10:36:34 -08:00 |
|
Brian Behlendorf
|
800463b2ef
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 10:36:33 -08:00 |
|
Brian Behlendorf
|
7e159c86a3
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-19 10:36:32 -08:00 |
|
Brian Behlendorf
|
294ebb7537
|
Fix C90 for(int i;;;) compliance issues
|
2008-12-19 10:34:41 -08:00 |
|
Brian Behlendorf
|
eeb4e47031
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 10:27:35 -08:00 |
|
Brian Behlendorf
|
bc6d2fee28
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-19 10:27:18 -08:00 |
|
Brian Behlendorf
|
27f8780a37
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-19 10:27:14 -08:00 |
|
Brian Behlendorf
|
9cccccce7c
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 10:27:10 -08:00 |
|
Brian Behlendorf
|
6fedd6ca38
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 10:27:06 -08:00 |
|
Brian Behlendorf
|
434356f979
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 10:27:02 -08:00 |
|
Brian Behlendorf
|
8985e2430d
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 10:26:57 -08:00 |
|
Brian Behlendorf
|
4ee870c380
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 10:26:57 -08:00 |
|
Brian Behlendorf
|
9a9a66d507
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-19 10:26:51 -08:00 |
|
Brian Behlendorf
|
f1ba2464f9
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 10:26:50 -08:00 |
|
Brian Behlendorf
|
d70529b743
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-19 10:26:27 -08:00 |
|
Brian Behlendorf
|
a5e6632531
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 10:26:20 -08:00 |
|
Brian Behlendorf
|
e3815b6d3f
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 10:26:18 -08:00 |
|
Brian Behlendorf
|
e312737766
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-19 10:26:18 -08:00 |
|
Brian Behlendorf
|
b66929fe90
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-19 10:26:17 -08:00 |
|
Brian Behlendorf
|
5ee6377759
|
Fix missing void in prototype
|
2008-12-19 10:24:26 -08:00 |
|
Brian Behlendorf
|
0a9ad44fff
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-18 13:53:57 -08:00 |
|
Brian Behlendorf
|
5b77a97eff
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-18 13:53:35 -08:00 |
|
Brian Behlendorf
|
63f8023d96
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-18 13:53:30 -08:00 |
|
Brian Behlendorf
|
e8815843b4
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-18 13:53:25 -08:00 |
|
Brian Behlendorf
|
41aaf052de
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-18 13:53:19 -08:00 |
|
Brian Behlendorf
|
4b7319cd19
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-18 13:53:14 -08:00 |
|
Brian Behlendorf
|
f4f6b1f529
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-18 13:53:09 -08:00 |
|
Brian Behlendorf
|
ecb1da0ac8
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-18 13:53:08 -08:00 |
|
Brian Behlendorf
|
1bf7e13e78
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-18 13:53:00 -08:00 |
|
Brian Behlendorf
|
ef0739a21d
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 13:52:59 -08:00 |
|
Brian Behlendorf
|
f7acab2b42
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-18 13:52:30 -08:00 |
|
Brian Behlendorf
|
22a4ca8484
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:52:21 -08:00 |
|
Brian Behlendorf
|
433b5c8023
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 13:52:17 -08:00 |
|
Brian Behlendorf
|
93bc33a39e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-18 13:52:16 -08:00 |
|
Brian Behlendorf
|
23e30eeec9
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-18 13:52:15 -08:00 |
|
Brian Behlendorf
|
6cccf01d35
|
Missed needed drc var
|
2008-12-18 13:50:12 -08:00 |
|
Brian Behlendorf
|
2f10910f57
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-18 13:44:51 -08:00 |
|
Brian Behlendorf
|
72d21b338c
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-18 13:44:31 -08:00 |
|
Brian Behlendorf
|
5200db236f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-18 13:44:26 -08:00 |
|
Brian Behlendorf
|
c20b05ba8f
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-18 13:44:21 -08:00 |
|
Brian Behlendorf
|
97e1edd90d
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-18 13:44:16 -08:00 |
|
Brian Behlendorf
|
2543240d85
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-18 13:44:11 -08:00 |
|
Brian Behlendorf
|
c513e66884
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-18 13:44:06 -08:00 |
|
Brian Behlendorf
|
360d4841e7
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-18 13:44:05 -08:00 |
|
Brian Behlendorf
|
bc05eda218
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-18 13:43:59 -08:00 |
|
Brian Behlendorf
|
07901e75cc
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 13:43:58 -08:00 |
|
Brian Behlendorf
|
3307f09de7
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-18 13:43:31 -08:00 |
|
Brian Behlendorf
|
bbd1cc6feb
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:43:23 -08:00 |
|
Brian Behlendorf
|
bab7f42832
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 13:43:20 -08:00 |
|
Brian Behlendorf
|
5ce7826ab4
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-18 13:43:19 -08:00 |
|
Brian Behlendorf
|
732fe6a75f
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-18 13:43:19 -08:00 |
|
Brian Behlendorf
|
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 |
|
Brian Behlendorf
|
9778e475c5
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-18 13:28:07 -08:00 |
|
Brian Behlendorf
|
4adc0464f2
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-18 13:27:47 -08:00 |
|
Brian Behlendorf
|
651f0337c4
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-18 13:27:42 -08:00 |
|
Brian Behlendorf
|
7c56a7d623
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-18 13:27:37 -08:00 |
|
Brian Behlendorf
|
83b052205b
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-18 13:27:32 -08:00 |
|
Brian Behlendorf
|
3ed3a6d46e
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-18 13:27:27 -08:00 |
|
Brian Behlendorf
|
a3cbac5278
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-18 13:27:23 -08:00 |
|
Brian Behlendorf
|
a0ba5c46c1
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-18 13:27:22 -08:00 |
|
Brian Behlendorf
|
6ef7594e64
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-18 13:27:15 -08:00 |
|
Brian Behlendorf
|
fea7eb9fe4
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 13:27:14 -08:00 |
|
Brian Behlendorf
|
b403d58557
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-18 13:26:47 -08:00 |
|
Brian Behlendorf
|
83e1d2bdbc
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:26:39 -08:00 |
|
Brian Behlendorf
|
1a6091791d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 13:26:36 -08:00 |
|
Brian Behlendorf
|
8f52e45adf
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-18 13:26:35 -08:00 |
|
Brian Behlendorf
|
8eccbd95b9
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-18 13:26:34 -08:00 |
|
Brian Behlendorf
|
163f096cb6
|
Resolve remove shadow, rename to rm
|
2008-12-18 13:24:37 -08:00 |
|
Brian Behlendorf
|
60cb2a1fd5
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-18 11:52:58 -08:00 |
|
Brian Behlendorf
|
830b60aae2
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-18 11:52:37 -08:00 |
|
Brian Behlendorf
|
b7bc2d2d19
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-18 11:52:32 -08:00 |
|
Brian Behlendorf
|
88e5d1800e
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-18 11:52:27 -08:00 |
|
Brian Behlendorf
|
2bccb1031a
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-18 11:52:22 -08:00 |
|
Brian Behlendorf
|
8531efbaf7
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-18 11:52:17 -08:00 |
|
Brian Behlendorf
|
f94274b339
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-18 11:52:12 -08:00 |
|
Brian Behlendorf
|
ec6250d9eb
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-18 11:52:11 -08:00 |
|
Brian Behlendorf
|
5242f45431
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-18 11:52:04 -08:00 |
|
Brian Behlendorf
|
5c0f0ca54f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 11:52:03 -08:00 |
|
Brian Behlendorf
|
16e04cd722
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-18 11:51:35 -08:00 |
|
Brian Behlendorf
|
85d3241806
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-18 11:51:27 -08:00 |
|
Brian Behlendorf
|
4be8cdca38
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 11:51:24 -08:00 |
|
Brian Behlendorf
|
cf4b3895f1
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-18 11:51:23 -08:00 |
|
Brian Behlendorf
|
458a2444c2
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-18 11:51:22 -08:00 |
|
Brian Behlendorf
|
d957a6c66f
|
Resolve dnp shadow conflict
|
2008-12-18 11:49:22 -08:00 |
|
Brian Behlendorf
|
2c348839b6
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-18 11:40:26 -08:00 |
|
Brian Behlendorf
|
a974c42a02
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-18 11:39:39 -08:00 |
|
Brian Behlendorf
|
caac73b67d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-18 11:39:34 -08:00 |
|
Brian Behlendorf
|
0b5b1b5cc0
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-18 11:39:29 -08:00 |
|
Brian Behlendorf
|
7b836ab418
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-18 11:39:24 -08:00 |
|
Brian Behlendorf
|
f63ea3c521
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-18 11:39:20 -08:00 |
|
Brian Behlendorf
|
60b7c664e0
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-18 11:39:15 -08:00 |