Commit Graph

17104 Commits

Author SHA1 Message Date
Brian Behlendorf 1d43bad922 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2010-03-08 13:48:27 -08:00
Brian Behlendorf 939be75fdd Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-03-08 13:48:24 -08:00
Brian Behlendorf aed42f2444 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-03-08 13:48:23 -08:00
Brian Behlendorf cf0d46b459 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-03-08 13:48:20 -08:00
Brian Behlendorf b87bc94fb0 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-03-08 13:48:19 -08:00
Brian Behlendorf fb218d5bc8 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2010-03-08 13:48:17 -08:00
Brian Behlendorf 7be37fe5f3 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-03-08 13:48:16 -08:00
Brian Behlendorf 9974a98a5d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-03-08 13:48:15 -08:00
Brian Behlendorf 1e27fbea72 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-03-08 13:48:10 -08:00
Brian Behlendorf f032bf3f37 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-03-08 13:48:09 -08:00
Brian Behlendorf 72f16fa921 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-03-08 13:48:06 -08:00
Brian Behlendorf 43dca1d995 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-03-08 13:48:05 -08:00
Brian Behlendorf 5f51cdd50a Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2010-03-08 13:48:02 -08:00
Brian Behlendorf e799eecfc8 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2010-03-08 13:48:02 -08:00
Brian Behlendorf 6dffc18479 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-03-08 13:47:59 -08:00
Brian Behlendorf 50e5d7ca18 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2010-03-08 13:47:58 -08:00
Brian Behlendorf 3d7cfde000 Remove Module.markers and Module.symver{s} in clean target
Split 'modules' and 'clean' Makefile targets to allow us to
cleanly remove the Module.* build products with a 'make clean'.
2010-03-08 13:45:51 -08:00
Brian Behlendorf 8739ae37f8 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-03-08 10:52:55 -08:00
Brian Behlendorf 356c4ba9a5 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-03-08 10:52:52 -08:00
Brian Behlendorf 0e589db79b Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-03-08 10:52:47 -08:00
Brian Behlendorf 3dbe796377 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-03-08 10:52:45 -08:00
Brian Behlendorf 60ac9b5deb Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-03-08 10:52:39 -08:00
Brian Behlendorf 2d709f3536 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-03-08 10:52:37 -08:00
Brian Behlendorf 2280f8278f Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-03-08 10:52:32 -08:00
Brian Behlendorf 9c8b2f03d3 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-03-08 10:52:30 -08:00
Brian Behlendorf 2184e609e5 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-03-08 10:52:24 -08:00
Brian Behlendorf 6e82c8b73b Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-03-08 10:52:22 -08:00
Brian Behlendorf 1c91d05eec Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-03-08 10:52:17 -08:00
Brian Behlendorf 060f2d598b Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-03-08 10:52:15 -08:00
Brian Behlendorf 5c038161b2 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-03-08 10:52:10 -08:00
Brian Behlendorf ba32cc7450 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-03-08 10:52:07 -08:00
Brian Behlendorf 33d658904e Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2010-03-08 10:52:02 -08:00
Brian Behlendorf 50c4f963a7 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2010-03-08 10:52:00 -08:00
Brian Behlendorf 5c7edca789 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-03-08 10:51:55 -08:00
Brian Behlendorf 87861f6863 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-03-08 10:51:53 -08:00
Brian Behlendorf ed3451bd03 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-03-08 10:51:47 -08:00
Brian Behlendorf 6ce79a427a Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-03-08 10:51:45 -08:00
Brian Behlendorf 5f863d5936 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2010-03-08 10:51:39 -08:00
Brian Behlendorf df688225a3 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-03-08 10:51:37 -08:00
Brian Behlendorf cb5949e65a Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-03-08 10:51:36 -08:00
Brian Behlendorf e84a97592e Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-03-08 10:51:26 -08:00
Brian Behlendorf 6b064eb059 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-03-08 10:51:24 -08:00
Brian Behlendorf 670547ed9d Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-03-08 10:51:19 -08:00
Brian Behlendorf d0762ac22f Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-03-08 10:51:17 -08:00
Brian Behlendorf b0a4073959 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2010-03-08 10:51:11 -08:00
Brian Behlendorf 998655dff0 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2010-03-08 10:51:09 -08:00
Brian Behlendorf f34e664f6e Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-03-08 10:51:04 -08:00
Brian Behlendorf 92edb9bf86 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2010-03-08 10:51:02 -08:00
Brian Behlendorf 4dbd1e59e5 Configure checks for kernel build options incompatible with the license
Changes for linux-kernel-disk topic branch, see commit fd75782.
2010-03-08 10:47:55 -08:00
Brian Behlendorf 7121867aea Configure checks for kernel build options incompatible with the license
Changes for linux-kernel-module topic branch, see commit fd75782.
2010-03-08 10:45:19 -08:00