39805572e4
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-12-11 12:08:52 -08:00
d9998b6844
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-12-11 12:08:50 -08:00
5ec2c70f50
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-12-11 12:08:45 -08:00
86debac4c4
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-12-11 12:08:43 -08:00
6f00d091ee
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-12-11 12:08:37 -08:00
0674a0774c
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-12-11 12:08:35 -08:00
7e29815c79
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-12-11 12:08:30 -08:00
27417de12c
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-12-11 12:08:28 -08:00
5dcf2351d3
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-12-11 12:08:22 -08:00
ed54c28b32
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-12-11 12:08:21 -08:00
0416d12f82
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-12-11 12:08:15 -08:00
7b8fbda25b
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-12-11 12:08:13 -08:00
f73c310efd
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-12-11 12:08:08 -08:00
4e7da53a39
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-12-11 12:08:06 -08:00
8d311b4841
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-12-11 12:08:00 -08:00
57e0171065
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-12-11 12:07:58 -08:00
8bc41ddf2e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-12-11 12:07:58 -08:00
46773cc7b9
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-12-11 12:07:48 -08:00
202884ef48
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-12-11 12:07:46 -08:00
9d8856d779
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-12-11 12:07:41 -08:00
8802ac978f
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-12-11 12:07:39 -08:00
d7b3e97ae5
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-12-11 12:07:33 -08:00
2b8880572a
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-12-11 12:07:31 -08:00
52fbfecea5
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-12-11 12:07:26 -08:00
d2c7ce43b6
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-12-11 12:07:24 -08:00
acd798cfd4
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-12-11 12:07:23 -08:00
f8d093f69b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-12-11 12:07:23 -08:00
0cc4cdb30d
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-12-11 12:07:22 -08:00
b76d12a644
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-12-11 12:07:22 -08:00
f76a6daca5
Use check_disk_change() instead of revalidate_disk().
...
For 2.6.27 kernels are earlier revalidate_disk() was not available.
However, check_disk_change() has been available for far longer and
will properly inform the kernel of the volume change for both older
and newer kernels.
2009-12-11 12:02:45 -08:00
0dad9b2f9a
Adding missed * in debug ASSERT.
2009-12-11 12:02:05 -08:00
8f1eb1049b
Use MAXOFFSET_T instead of SPEC_MAXOFFSET_T for 32-bit arch.
2009-12-11 12:01:16 -08:00
ba7ccf8ccd
Cast to unsigned long long for 32-bit arches
2009-12-11 11:41:04 -08:00
664025877c
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-11-24 15:52:52 -08:00
3d17dbfa84
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-11-24 15:52:50 -08:00
772cb0f0b0
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-11-24 15:52:45 -08:00
cc180ae279
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-11-24 15:52:43 -08:00
01117b965d
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-11-24 15:52:39 -08:00
24eb001a38
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-11-24 15:52:36 -08:00
9cc792fff7
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-11-24 15:52:32 -08:00
21005d4bf4
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-11-24 15:52:30 -08:00
5a600fd515
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-11-24 15:52:25 -08:00
ffa4167a7b
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-11-24 15:52:23 -08:00
4e9252b4dc
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-11-24 15:52:18 -08:00
4177b182ab
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-11-24 15:52:16 -08:00
b931d27ac0
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-11-24 15:52:11 -08:00
35d5a20099
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-11-24 15:52:09 -08:00
f43b57d793
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-11-24 15:52:04 -08:00
692fc218f0
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-11-24 15:52:02 -08:00
53b51f6f7e
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-11-24 15:51:57 -08:00
Brian Behlendorf