a83be96d1e
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-12-11 16:21:21 -08:00
e4c253b3e3
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2009-12-11 16:21:19 -08:00
2a5101737e
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2009-12-11 16:21:18 -08:00
404d3c8509
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2009-12-11 16:21:16 -08:00
6be4f70345
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2009-12-11 16:21:15 -08:00
9f1c6b0416
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-12-11 16:21:13 -08:00
912a3fa030
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-12-11 16:21:12 -08:00
69dcaf00f3
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-12-11 16:21:11 -08:00
ac0fb4a24e
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-12-11 16:21:10 -08:00
058ac9ba78
Pull in latest man pages as part of update-zfs.sh
...
The script has been updated to download the latest documentations
packages for Solaris and extract the needed ZFS man pages. These
will still need a little markup to handle changes between the
Solaris and Linux versions of ZFS. Howver, they should be pretty
minor I've tried hard to keep the interface the same.
In additional to the script update the zdb, zfs, and zpool man
pages have been added to the repo.
2009-12-11 16:15:33 -08:00
431767016a
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-12-11 14:11:18 -08:00
303178da41
Revert linux-doc changes
2009-12-11 14:07:53 -08:00
e631b8bace
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-12-11 12:09:14 -08:00
10b89554b5
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-12-11 12:09:12 -08:00
4764e90619
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-12-11 12:09:06 -08:00
97fc907b21
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-12-11 12:09:04 -08:00
83902d607a
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-12-11 12:08:59 -08:00
1c8337e940
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-12-11 12:08:57 -08:00
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
Brian Behlendorf