Brian Behlendorf
|
29dd6c3161
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-11-20 10:30:42 -08:00 |
Brian Behlendorf
|
7da32c3c8e
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-11-20 10:30:41 -08:00 |
Brian Behlendorf
|
07cdadc1f8
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-11-20 10:30:27 -08:00 |
Brian Behlendorf
|
cac1bc41dc
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-11-20 10:29:49 -08:00 |
Brian Behlendorf
|
77c347db31
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-11-20 10:29:48 -08:00 |
Brian Behlendorf
|
0f315a58bb
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2009-11-20 10:29:47 -08:00 |
Brian Behlendorf
|
0160d32326
|
Symbol spa_busy() not required in Linux port removing EXPORT_SYMBOL
|
2009-11-20 10:16:37 -08:00 |
Brian Behlendorf
|
3191b962f6
|
Prevent gcc uninit compiler warning in zfs_range_unlock_reader().
|
2009-11-20 09:59:58 -08:00 |
Brian Behlendorf
|
52f859a6cc
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-11-15 16:27:59 -08:00 |
Brian Behlendorf
|
af5810b03a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-11-15 16:27:59 -08:00 |
Brian Behlendorf
|
b6c57fe77e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-11-15 16:27:44 -08:00 |
Brian Behlendorf
|
d00a0ea8a0
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-11-15 16:27:02 -08:00 |
Brian Behlendorf
|
59cbe87375
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-11-15 16:26:31 -08:00 |
Brian Behlendorf
|
217998d1a3
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2009-11-15 16:26:12 -08:00 |
Brian Behlendorf
|
d8aef5d7bc
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-11-15 16:25:52 -08:00 |
Brian Behlendorf
|
030d49c262
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2009-11-15 16:25:50 -08:00 |
Brian Behlendorf
|
0aa61e8427
|
Remove zvol.c when updating in update-zfs.sh Linux version available.
|
2009-11-15 16:20:01 -08:00 |
Brian Behlendorf
|
5b421bb734
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-10-06 12:27:51 -07:00 |
Brian Behlendorf
|
6df0b54851
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-10-06 12:27:50 -07:00 |
Brian Behlendorf
|
5bc2e9e592
|
Add spa_config_path module option for alternate cache file.
|
2009-10-06 12:17:38 -07:00 |
Brian Behlendorf
|
e6359e0281
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-10-01 17:08:10 -07:00 |
Brian Behlendorf
|
3c5e68488a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-10-01 17:08:09 -07:00 |
Brian Behlendorf
|
6e2c55b5a6
|
Update to use spl_module_{init,exit}() macro API.
|
2009-10-01 16:47:49 -07:00 |
Brian Behlendorf
|
d2450a3d32
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-08-18 14:20:23 -07:00 |
Brian Behlendorf
|
431189f377
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-08-18 14:20:21 -07:00 |
Brian Behlendorf
|
ad97c53c74
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-08-18 14:19:57 -07:00 |
Brian Behlendorf
|
e4b55cfbff
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-08-18 14:18:36 -07:00 |
Brian Behlendorf
|
5d83878f46
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-08-18 14:18:34 -07:00 |
Brian Behlendorf
|
ef74bed821
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2009-08-18 14:18:32 -07:00 |
Brian Behlendorf
|
f3ddd9d082
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2009-08-18 14:18:32 -07:00 |
Brian Behlendorf
|
8767bb3fdd
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-08-18 14:18:31 -07:00 |
Brian Behlendorf
|
218ddf3d52
|
Required build 121 updates for linux-kernel-module
|
2009-08-18 14:10:33 -07:00 |
Brian Behlendorf
|
f9a74de46a
|
Required build 121 updates for gcc-uninit
|
2009-08-18 14:09:35 -07:00 |
Brian Behlendorf
|
08f5b3c23d
|
Required build 121 updates for gcc-shadow
|
2009-08-18 14:09:15 -07:00 |
Brian Behlendorf
|
d42b88372f
|
Required build 121 updates for gcc-c90
|
2009-08-18 14:07:25 -07:00 |
Brian Behlendorf
|
6a97dcc2bf
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-08-18 12:33:39 -07:00 |
Brian Behlendorf
|
7c3b0a4a2f
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-08-18 12:33:35 -07:00 |
Brian Behlendorf
|
954484f75d
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
Conflicts:
module/zfs/dsl_dataset.c
module/zfs/spa_history.c
|
2009-08-18 12:32:53 -07:00 |
Brian Behlendorf
|
50c623ccef
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-08-18 12:10:55 -07:00 |
Brian Behlendorf
|
b99b422796
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-08-18 12:08:58 -07:00 |
Brian Behlendorf
|
db89339134
|
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
Conflicts:
module/zfs/dmu.c
|
2009-08-18 12:07:23 -07:00 |
Brian Behlendorf
|
c5b5d32d69
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
Conflicts:
module/zfs/vdev_raidz.c
|
2009-08-18 12:06:21 -07:00 |
Brian Behlendorf
|
e5e4fadc34
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Conflicts:
module/zfs/dmu.c
module/zfs/dsl_deleg.c
module/zfs/rrwlock.c
module/zfs/vdev_raidz.c
|
2009-08-18 12:04:53 -07:00 |
Brian Behlendorf
|
0f80e41c89
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Conflicts:
module/zfs/spa_misc.c
module/zfs/vdev_label.c
|
2009-08-18 11:55:36 -07:00 |
Brian Behlendorf
|
45d1cae3b8
|
Rebase master to b121
|
2009-08-18 11:43:27 -07:00 |
Brian Behlendorf
|
a089c64daa
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-08-04 15:56:23 -07:00 |
Brian Behlendorf
|
f2018fdf21
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-08-04 15:56:21 -07:00 |
Brian Behlendorf
|
56204aacac
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-08-04 15:55:55 -07:00 |
Brian Behlendorf
|
f88cbd6535
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-08-04 15:54:21 -07:00 |
Brian Behlendorf
|
8c28ed9bff
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2009-08-04 15:54:19 -07:00 |