Commit Graph

15965 Commits

Author SHA1 Message Date
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
Brian Behlendorf 1f1a3c2e21 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-11-02 15:09:47 -08:00
Brian Behlendorf df41768ce6 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-11-02 15:09:44 -08:00
Brian Behlendorf 6697078d8c Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-11-02 15:09:39 -08:00
Brian Behlendorf 4df52d7852 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-11-02 15:09:37 -08:00
Brian Behlendorf 6539d080cb Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-11-02 15:09:32 -08:00
Brian Behlendorf 5a753801d2 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-11-02 15:09:30 -08:00
Brian Behlendorf 5f3b06967e Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-11-02 15:09:29 -08:00
Brian Behlendorf d2583718f0 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-11-02 15:09:20 -08:00
Brian Behlendorf d844c110c9 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-11-02 15:09:18 -08:00
Brian Behlendorf a4247e96c7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-11-02 15:09:18 -08:00
Brian Behlendorf 1d432f256d Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-11-02 15:09:08 -08:00
Brian Behlendorf 3967cae113 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-11-02 15:09:06 -08:00
Brian Behlendorf 4bf29af79c Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-11-02 15:09:01 -08:00
Brian Behlendorf d915b350fe Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-11-02 15:08:58 -08:00
Brian Behlendorf 97a557226f Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-11-02 15:08:53 -08:00
Brian Behlendorf efde8cbe13 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-11-02 15:08:51 -08:00
Brian Behlendorf 7d02a81ee3 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-11-02 15:08:46 -08:00
Brian Behlendorf c9a6814fc4 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-11-02 15:08:44 -08:00
Brian Behlendorf a75cfcd5eb Add e2fsprogs patch for detecting ZFS uberblocks until it appears upstream. 2009-11-02 15:04:43 -08:00
Brian Behlendorf 792f83c8ac Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-11-02 14:16:47 -08:00
Brian Behlendorf edae5549b8 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-11-02 14:16:45 -08:00
Brian Behlendorf abd3b0b2d3 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-11-02 14:16:40 -08:00
Brian Behlendorf 23146743d9 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-11-02 14:16:38 -08:00
Brian Behlendorf 95dc0e6b55 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-11-02 14:16:33 -08:00
Brian Behlendorf 5dacb1d767 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-11-02 14:16:31 -08:00
Brian Behlendorf 57f7567938 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-11-02 14:16:26 -08:00
Brian Behlendorf f274f73feb Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-11-02 14:16:24 -08:00
Brian Behlendorf a5485c5560 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-11-02 14:16:19 -08:00
Brian Behlendorf 886ea1b6f8 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-11-02 14:16:17 -08:00