Brian Behlendorf
|
d43e9ca262
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-03-11 10:40:31 -07:00 |
Brian Behlendorf
|
d641369d38
|
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
|
2009-03-11 10:32:45 -07:00 |
Ricardo M. Correia
|
fd9a7a0fb4
|
Add 'ull' suffix to 64-bit constants.
|
2009-03-11 10:31:24 -07:00 |
Brian Behlendorf
|
55dcb5b609
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-10 21:40:37 -07:00 |
Brian Behlendorf
|
a03a940a3b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-10 21:40:35 -07:00 |
Brian Behlendorf
|
952e70b1a0
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-10 21:40:19 -07:00 |
Brian Behlendorf
|
4911b7be4d
|
zpios subdir should be on linux-zpios branch
|
2009-03-10 21:33:24 -07:00 |
Brian Behlendorf
|
799aae7107
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-10 21:27:22 -07:00 |
Brian Behlendorf
|
729130ffaa
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-10 21:27:20 -07:00 |
Brian Behlendorf
|
e610bf6e09
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-10 21:26:59 -07:00 |
Brian Behlendorf
|
c8e569dd1c
|
Build system and packaging (RPM support) (Part 2)
Complete support for dist install srpm and rpm make targets.
|
2009-03-10 21:13:30 -07:00 |
Brian Behlendorf
|
2cbe1d0785
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-02-18 16:38:16 -08:00 |
Brian Behlendorf
|
fab643a25b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-02-18 16:38:15 -08:00 |
Brian Behlendorf
|
87245deaab
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-02-18 16:37:54 -08:00 |
Brian Behlendorf
|
b57a283336
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-02-18 16:36:19 -08:00 |
Brian Behlendorf
|
d53b9a34ea
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-02-18 16:36:17 -08:00 |
Brian Behlendorf
|
e6c50e7136
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-02-18 16:36:16 -08:00 |
Brian Behlendorf
|
a0ef7f5826
|
C90 fixes int declared in for() is a C99 construct
|
2009-02-18 16:30:01 -08:00 |
Brian Behlendorf
|
c44051f635
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-02-18 16:22:25 -08:00 |
Brian Behlendorf
|
9aab96eb9d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-02-18 16:22:23 -08:00 |
Brian Behlendorf
|
b4b7da1314
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-02-18 16:22:02 -08:00 |
Brian Behlendorf
|
6c4c486b9e
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-02-18 16:20:33 -08:00 |
Brian Behlendorf
|
c1d525d6e9
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-02-18 16:20:32 -08:00 |
Brian Behlendorf
|
fd9fdb78c6
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2009-02-18 16:20:30 -08:00 |
Brian Behlendorf
|
f07954ef8a
|
Pass 0's instead of NULL's which are the same but of the correct type
|
2009-02-18 16:14:20 -08:00 |
Brian Behlendorf
|
eb3d5e7051
|
Local try should be in this patch
|
2009-02-18 14:47:06 -08:00 |
Brian Behlendorf
|
47c6526993
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-02-18 14:35:09 -08:00 |
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
|
9f4865e4ca
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-02-18 14:34:45 -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
|
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
|
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
|
41cba9f136
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-15 16:32:08 -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
|
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
|
9c8802c7e4
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-15 15:29:55 -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
|
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
|
141235d905
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-15 14:52:47 -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
|
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
|
1a4ae03863
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-15 14:39:18 -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
|
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
|
ab52989424
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-15 14:29:50 -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
|
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
|
091a4a4ca4
|
Resolve conflict with removed cleaner type
|
2009-01-15 14:20:49 -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
|
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
|
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
|
c0edd1f948
|
Remove unneeded header
|
2009-01-14 13:30:32 -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
|
f63f4dd2cd
|
Remove unneeded chunk, create a FS the real way with an ioctl
|
2009-01-14 08:26:09 -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
|
fce0143a40
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 16:07:45 -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
|
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
|
c3335290e2
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 15:34:38 -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
|
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
|
925ed2c7a0
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 15:07:44 -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
|
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
|
042deede25
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 15:02:49 -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
|
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
|
b289f6dd98
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 14:18:50 -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
|
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
|
935c8157f9
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-13 13:33:09 -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
|
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
|
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
|
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
|
3977cefecc
|
Update load/unload message, mknod /dev/zfs when udev is unavailable
|
2009-01-09 16:50:28 -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
|
7001fd57fa
|
Register sensible init/fini hooks
|
2009-01-09 16:38:13 -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
|
d9a45283ce
|
Add ZFS load/unload console messages
|
2009-01-09 16:28:26 -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
|
1dc5e6d02e
|
Remove HAVE_SPL should be HAVE_ZPL
|
2009-01-09 15:50:00 -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
|
be3a17e437
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 14:45:45 -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
|
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
|
03a4aefbcf
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 14:18:25 -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
|
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
|
bc5e2d8660
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 13:33:48 -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
|
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
|
18f3ecb485
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 12:48:17 -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
|
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
|
f0f1f7362d
|
Remove invalid tunable
|
2009-01-09 11:42:31 -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
|
dd50143ea1
|
Add module load/unload entry point hooks and ioctl integration
|
2009-01-09 11:21:59 -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
|
ed92da1e4e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 09:22:24 -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
|
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
|
53a6418874
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-07 15:52:31 -08:00 |
Brian Behlendorf
|
2a76f03369
|
Update distfiles
|
2009-01-07 15:49:36 -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
|
f01d7c3dba
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-06 13:46:02 -08:00 |
Brian Behlendorf
|
6280843d13
|
Remove until it can be updated
|
2009-01-06 13:43: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
|
74bff69746
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-06 13:16:42 -08:00 |
Brian Behlendorf
|
f9494f2bb1
|
Build missing sources
|
2009-01-06 13:14:30 -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
|
57aad95a52
|
Refresh exported symbols
|
2009-01-06 12:59:50 -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
|
da647d38a3
|
Refresh exported symbols, remove zio_resume_threads as out of date
|
2009-01-06 09:38:39 -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
|
bc820e95a6
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-06 09:30:29 -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
|
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
|
d71643eb94
|
Refresh exported symbols
|
2009-01-06 09:14:10 -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
|
1c496f0235
|
Refresh exported spa_config symbols
|
2009-01-06 08:59:36 -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
|
90ff526841
|
Remove symbol exports no longer needed with the dsl scrub rewrite
|
2009-01-05 16:55:15 -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
|
d763974558
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 16:39:26 -08:00 |
Brian Behlendorf
|
9d4d588938
|
Comment out until ZPL implemented
|
2009-01-05 16:34:01 -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
|
76d40e2e81
|
Update exported symbols
|
2009-01-05 15:58:50 -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
|
b2db87f254
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 15:45:05 -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
|
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
|
eb58273a29
|
Update exported symbol names for new traversal code
|
2009-01-05 15:19:35 -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
|
ec462ce48f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 14:28:33 -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
|
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
|
d8f9597730
|
Always include u8_textprep
|
2009-01-05 14:12:03 -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
|
0c9de0c356
|
Linux kernel modularize unicode
|
2009-01-05 13:57:26 -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
|
9c2bf69ecb
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 12:40:25 -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
|
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
|
1c1ec8cce6
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 12:10:37 -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
|
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
|
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
|
39953e7eb3
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-23 13:49:47 -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
|
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
|
f49886c003
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-23 13:13:29 -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
|
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
|
c22ff325ce
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-23 12:50:58 -08:00 |
Brian Behlendorf
|
0dfd5ebee8
|
module/zcommon/Makefile.in
|
2008-12-23 12:47:03 -08:00 |