Commit Graph

5282 Commits

Author SHA1 Message Date
Brian Behlendorf d4c39af7a6 Re-add KM_PUSHPAGE 2008-12-19 10:15:52 -08:00
Brian Behlendorf 330840ff2e Re-add KM_PUSHPAGE 2008-12-19 10:15:27 -08:00
Brian Behlendorf b6d881a293 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 10:11:30 -08:00
Brian Behlendorf 75b98b396b Add missing VM types 2008-12-19 10:09:35 -08:00
Brian Behlendorf 67b265106b Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 10:03:31 -08:00
Brian Behlendorf 8578673221 Add DTRACE_PROBE(a) macro 2008-12-19 10:01:38 -08:00
Brian Behlendorf 857e8ea1c0 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-19 09:54:50 -08:00
Brian Behlendorf 3845f85e42 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-19 09:54:48 -08:00
Brian Behlendorf 1b163c7db9 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 09:54:44 -08:00
Brian Behlendorf fa6f423f31 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-19 09:54:43 -08:00
Brian Behlendorf fbd1ea4583 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-19 09:54:39 -08:00
Brian Behlendorf b1cbded73a Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-19 09:54:37 -08:00
Brian Behlendorf be8c2f3d9d Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-19 09:54:33 -08:00
Brian Behlendorf cd0966054f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-19 09:54:32 -08:00
Brian Behlendorf 82db9e46fa Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-19 09:54:28 -08:00
Brian Behlendorf e60107ab95 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-19 09:54:26 -08:00
Brian Behlendorf 531670e928 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-19 09:54:23 -08:00
Brian Behlendorf b164745a8d Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-19 09:54:21 -08:00
Brian Behlendorf dd702391f8 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-19 09:54:17 -08:00
Brian Behlendorf 530b2e6564 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-19 09:54:15 -08:00
Brian Behlendorf 069e5a9703 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-19 09:54:12 -08:00
Brian Behlendorf 0f22033b0a Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-19 09:54:09 -08:00
Brian Behlendorf 255e78bd8a Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-19 09:54:06 -08:00
Brian Behlendorf e17e93da32 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 09:54:04 -08:00
Brian Behlendorf f4ea43fbfc Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-19 09:54:00 -08:00
Brian Behlendorf ec916d278e Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 09:53:57 -08:00
Brian Behlendorf baf0ac5825 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-19 09:53:54 -08:00
Brian Behlendorf 9a20c1615b Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 09:53:52 -08:00
Brian Behlendorf 2462b347c9 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-19 09:53:48 -08:00
Brian Behlendorf aa773011d1 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-19 09:53:46 -08:00
Brian Behlendorf 72f0470ded Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-19 09:53:46 -08:00
Brian Behlendorf fc7e8ad2d9 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-12-19 09:53:40 -08:00
Brian Behlendorf 07e52b7450 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-12-19 09:53:38 -08:00
Brian Behlendorf 1a0d43ceac Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 09:53:37 -08:00
Brian Behlendorf 917fa35bf8 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-19 09:53:31 -08:00
Brian Behlendorf 4c00aff74b Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-19 09:53:29 -08:00
Brian Behlendorf b5a60fecb8 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-19 09:53:25 -08:00
Brian Behlendorf ed7b471adc Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-19 09:53:23 -08:00
Brian Behlendorf ecadaa6722 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-19 09:53:19 -08:00
Brian Behlendorf 10fd4b002f Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-19 09:53:17 -08:00
Brian Behlendorf d89b9842de Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-19 09:53:14 -08:00
Brian Behlendorf 8fca960b4e Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-19 09:53:12 -08:00
Brian Behlendorf 9f4bcfcdd8 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-19 09:53:08 -08:00
Brian Behlendorf 475f73d0d3 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-19 09:53:06 -08:00
Brian Behlendorf 01b97c6100 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-19 09:53:03 -08:00
Brian Behlendorf 684a356d97 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-19 09:53:01 -08:00
Brian Behlendorf 24e15d1bb1 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 09:52:57 -08:00
Brian Behlendorf e33530897a Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-19 09:52:54 -08:00
Brian Behlendorf 2d0ae2710c Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 09:52:53 -08:00
Brian Behlendorf 5906903384 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-19 09:52:52 -08:00