Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity
22,481 Commits 42 Branches 132 Tags 226 MiB
Commit Graph

22481 Commits

Author SHA1 Message Date
Brian Behlendorf 64661f174f Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch 2010-08-02 15:31:45 -07:00
Brian Behlendorf 2495006545 Merge commit 'refs/top-bases/linux-topology' into linux-topology 2010-08-02 15:31:43 -07:00
Brian Behlendorf dfc9bf2351 Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch 2010-08-02 15:31:37 -07:00
Brian Behlendorf 6efff5aac6 Merge commit 'refs/top-bases/linux-sha2' into linux-sha2 2010-08-02 15:31:34 -07:00
Brian Behlendorf c261b3e241 Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch 2010-08-02 15:31:28 -07:00
Brian Behlendorf e0ad8ffcb4 Merge commit 'refs/top-bases/linux-user-util' into linux-user-util 2010-08-02 15:31:26 -07:00
Brian Behlendorf d079b7da82 Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-08-02 15:31:19 -07:00
Brian Behlendorf 319781e873 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-08-02 15:31:17 -07:00
Brian Behlendorf 86b05fafcd Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch 2010-08-02 15:31:11 -07:00
Brian Behlendorf 3fc23e1d2f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-08-02 15:31:08 -07:00
Brian Behlendorf 5c484fba8b Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-08-02 15:31:02 -07:00
Brian Behlendorf 29bd1f8bcf Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-08-02 15:30:59 -07:00
Brian Behlendorf 9770449812 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-08-02 15:30:54 -07:00
Brian Behlendorf 69a71fc334 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-08-02 15:30:51 -07:00
Brian Behlendorf 4ab890b36f Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-08-02 15:30:46 -07:00
Brian Behlendorf b7ded8197e Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-08-02 15:30:44 -07:00
Brian Behlendorf 264e63a534 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-08-02 15:30:38 -07:00
Brian Behlendorf 7ebebd2f3d Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-08-02 15:30:36 -07:00
Brian Behlendorf da70a72de5 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-08-02 15:30:30 -07:00
Brian Behlendorf 6f0e3de0e4 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-08-02 15:30:28 -07:00
Brian Behlendorf 44cdd1eac0 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-08-02 15:30:21 -07:00
Brian Behlendorf bd0c77e079 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-08-02 15:30:19 -07:00
Brian Behlendorf 6499a250fd Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-08-02 15:30:13 -07:00
Brian Behlendorf 776056d7f1 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-08-02 15:30:11 -07:00
Brian Behlendorf 2af15f5813 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-08-02 15:30:05 -07:00
Brian Behlendorf e331989e8a Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-08-02 15:30:03 -07:00
Brian Behlendorf cc22790f9c Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-08-02 15:29:57 -07:00
Brian Behlendorf ec00e089d3 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-08-02 15:29:55 -07:00
Brian Behlendorf 9140f34e9a Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-08-02 15:29:48 -07:00
Brian Behlendorf 640888ec74 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-08-02 15:29:46 -07:00
Brian Behlendorf bf44e39499 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-08-02 15:29:39 -07:00
Brian Behlendorf a8d9f13ab5 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-08-02 15:29:37 -07:00
Brian Behlendorf c6e0144f79 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-08-02 15:29:31 -07:00
Brian Behlendorf aa54b2619c Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-08-02 15:29:28 -07:00
Brian Behlendorf 8481c9b7bb Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-08-02 15:29:28 -07:00
Brian Behlendorf 7e9bdac1a8 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-08-02 15:29:27 -07:00
Brian Behlendorf 8bf0a4e79c Merge branch 'fix-stack-inline' into refs/top-bases/fix-branch 2010-08-02 15:29:25 -07:00
Brian Behlendorf 78798f0ea5 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-08-02 15:29:25 -07:00
Brian Behlendorf 45c00bf359 Fix spa_load_impl() prototype 
Both the forward declaration of spa_load_impl() and the actual
function declaration must match.
 2010-08-02 15:24:33 -07:00
Brian Behlendorf 52c23142d4 Revert "Inline zio_execute() to reduce stack use" 
This reverts commit 411dd65af1.

gcc version 4.1.2 does not like having differing prototypes
for zio_execute, one version in the .c with inline and one
version in the .h without.  Thus I'm reverting this change
and we'll see how critical this particular stack reduction is.
 2010-08-02 15:22:11 -07:00
Brian Behlendorf 34fb712ff9 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-08-02 14:19:55 -07:00
Brian Behlendorf 7704501f60 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2010-08-02 14:19:53 -07:00
Brian Behlendorf 8327e0cebb Merge branch 'linux-have-mlslabel' into refs/top-bases/linux-zfs-branch 2010-08-02 14:19:52 -07:00
Brian Behlendorf d0be3ff424 Merge commit 'refs/top-bases/linux-have-mlslabel' into linux-have-mlslabel 2010-08-02 14:19:50 -07:00
Brian Behlendorf 82a32942aa Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch 2010-08-02 14:19:44 -07:00
Brian Behlendorf d19606b3d9 Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread 2010-08-02 14:19:42 -07:00
Brian Behlendorf efb7989c99 Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch 2010-08-02 14:19:36 -07:00
Brian Behlendorf 09091268f8 Merge commit 'refs/top-bases/linux-topology' into linux-topology 2010-08-02 14:19:34 -07:00
Brian Behlendorf f151fd6bec Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch 2010-08-02 14:19:28 -07:00
Brian Behlendorf c46c573c09 Merge commit 'refs/top-bases/linux-sha2' into linux-sha2 2010-08-02 14:19:26 -07:00