Brian Behlendorf
|
2c9a7c8282
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:56:13 -08:00 |
|
Brian Behlendorf
|
f872f7968a
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-11-12 12:56:08 -08:00 |
|
Brian Behlendorf
|
e787523834
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:56:08 -08:00 |
|
Brian Behlendorf
|
acd3b4321f
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:56:04 -08:00 |
|
Brian Behlendorf
|
b3b6ee0f08
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-11-12 12:56:03 -08:00 |
|
Brian Behlendorf
|
60ec816504
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:55:59 -08:00 |
|
Brian Behlendorf
|
7ffe671c18
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-11-12 12:55:58 -08:00 |
|
Brian Behlendorf
|
a4fb9a97f1
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:55:54 -08:00 |
|
Brian Behlendorf
|
ad091adb8c
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-11-12 12:55:53 -08:00 |
|
Brian Behlendorf
|
e68f100aaa
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:55:49 -08:00 |
|
Brian Behlendorf
|
a29ea4d50f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-11-12 12:55:48 -08:00 |
|
Brian Behlendorf
|
69780e805d
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:55:44 -08:00 |
|
Brian Behlendorf
|
2c1487c22c
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-11-12 12:55:43 -08:00 |
|
Brian Behlendorf
|
f2ad87e27f
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:55:39 -08:00 |
|
Brian Behlendorf
|
a9f00e5115
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-11-12 12:55:38 -08:00 |
|
Brian Behlendorf
|
1a1533ca9e
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-11-12 12:55:38 -08:00 |
|
Brian Behlendorf
|
17360d9fd7
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:55:30 -08:00 |
|
Brian Behlendorf
|
9256e1cb7b
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-11-12 12:55:29 -08:00 |
|
Brian Behlendorf
|
2be7931436
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-11-12 12:55:28 -08:00 |
|
Brian Behlendorf
|
90aef60ba5
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:55:21 -08:00 |
|
Brian Behlendorf
|
6a111a71cc
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-11-12 12:55:20 -08:00 |
|
Brian Behlendorf
|
fdabbf4373
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:55:16 -08:00 |
|
Brian Behlendorf
|
9eb57a166b
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-11-12 12:55:15 -08:00 |
|
Brian Behlendorf
|
5562cdcfad
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:55:11 -08:00 |
|
Brian Behlendorf
|
f70c9952ee
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-11-12 12:55:10 -08:00 |
|
Brian Behlendorf
|
6e4bdb5378
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-11-12 12:55:06 -08:00 |
|
Brian Behlendorf
|
505c9c10fa
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-11-12 12:55:05 -08:00 |
|
Brian Behlendorf
|
73fe782522
|
Use HAVE_BDEV_LOGICAL_BLOCK_SIZE compat marco in vdev_disk.
This is a 2.6.31 API change.
|
2009-11-12 12:51:16 -08:00 |
|
Brian Behlendorf
|
9ee04032de
|
Linux 2.6.31 logical block size compatibility.
Autoconf check for bdev_logical_block_size() helper which replaced
bdev_hardsect_size() as the correct way to get the sector size.
|
2009-11-12 12:49:01 -08:00 |
|
Brian Behlendorf
|
564d6273e2
|
Mutexs will exceed 64 bytes for debug builds in 2.6.31 kernels.
Increase the pad size accordingly to handle this.
|
2009-11-12 12:45:28 -08:00 |
|
Brian Behlendorf
|
2d4b30749c
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-11-02 15:11:00 -08:00 |
|
Brian Behlendorf
|
532330e082
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-11-02 15:10:58 -08:00 |
|
Brian Behlendorf
|
2b34bb84c1
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-11-02 15:10:52 -08:00 |
|
Brian Behlendorf
|
6d120fc7de
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-11-02 15:10:51 -08:00 |
|
Brian Behlendorf
|
f8bc087744
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-11-02 15:10:45 -08:00 |
|
Brian Behlendorf
|
ed1377a7e3
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-11-02 15:10:43 -08:00 |
|
Brian Behlendorf
|
382521be8b
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-11-02 15:10:38 -08:00 |
|
Brian Behlendorf
|
9b0ef81d5b
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-11-02 15:10:36 -08:00 |
|
Brian Behlendorf
|
fe43876edc
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-11-02 15:10:30 -08:00 |
|
Brian Behlendorf
|
3d023d9a2e
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-11-02 15:10:29 -08:00 |
|
Brian Behlendorf
|
828709c707
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-11-02 15:10:23 -08:00 |
|
Brian Behlendorf
|
ba6c0da053
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-11-02 15:10:21 -08:00 |
|
Brian Behlendorf
|
26375ddf37
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-11-02 15:10:16 -08:00 |
|
Brian Behlendorf
|
62cd69dcea
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-11-02 15:10:14 -08:00 |
|
Brian Behlendorf
|
79442531ec
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-11-02 15:10:09 -08:00 |
|
Brian Behlendorf
|
d847ad2e35
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-11-02 15:10:07 -08:00 |
|
Brian Behlendorf
|
1d86bbfce9
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-11-02 15:10:01 -08:00 |
|
Brian Behlendorf
|
433a3f11fd
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-11-02 15:09:59 -08:00 |
|
Brian Behlendorf
|
a34aac7c5e
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-11-02 15:09:54 -08:00 |
|
Brian Behlendorf
|
0f53a7823b
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-11-02 15:09:52 -08:00 |