6187d3100e
Update ChangeLog
2009-07-02 13:56:29 -07:00
147cf2a952
Update zfs-module rependencies to require spl-modules
2009-07-02 13:29:33 -07:00
22940e5248
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-07-02 10:52:38 -07:00
0ebc2edb0b
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-07-02 10:52:37 -07:00
10d3423457
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-07-02 10:52:31 -07:00
38fe67bd26
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-02 10:52:29 -07:00
0fe70d3928
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-07-02 10:52:24 -07:00
1fde6b6a13
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-07-02 10:52:22 -07:00
1373b978d2
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-02 10:52:17 -07:00
43a9ed8954
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-07-02 10:52:15 -07:00
e061b6dc51
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-07-02 10:52:10 -07:00
a04973fad0
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-02 10:52:08 -07:00
c1dd4b2d96
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-07-02 10:52:02 -07:00
1191de4458
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-02 10:52:00 -07:00
df7155c2f3
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-07-02 10:51:55 -07:00
a1cb5b5a84
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-02 10:51:53 -07:00
a370f423bc
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-07-02 10:51:48 -07:00
cc9b909ad8
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-07-02 10:51:46 -07:00
a1a64613d4
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-07-02 10:51:41 -07:00
fa0577a214
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-02 10:51:39 -07:00
02890a90d2
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-07-02 10:51:34 -07:00
da81cfd26a
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-02 10:51:31 -07:00
167922f565
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-07-02 10:51:26 -07:00
ea7e988632
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-02 10:51:24 -07:00
c1341a9d3b
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-07-02 10:51:19 -07:00
a226c396c2
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-02 10:51:17 -07:00
6e65be6cdb
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-02 10:51:16 -07:00
885d2789e0
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-02 10:51:07 -07:00
753473193c
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-02 10:51:05 -07:00
43d87ed5ba
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-02 10:51:05 -07:00
156f8146d6
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-07-02 10:50:55 -07:00
8dc83f1f39
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-07-02 10:50:54 -07:00
e8a38e5a26
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-07-02 10:50:49 -07:00
615396ec6d
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-07-02 10:50:47 -07:00
8f40154d11
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-07-02 10:50:42 -07:00
ff1a519452
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-02 10:50:40 -07:00
20e2c39f04
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-07-02 10:50:35 -07:00
cfb773d577
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-07-02 10:50:33 -07:00
3ea0aff2e6
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-07-02 10:50:28 -07:00
0d2d87e028
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-02 10:50:27 -07:00
c7fa6076d5
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-07-02 10:50:22 -07:00
64fedf2e01
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-07-02 10:50:20 -07:00
3a1429124c
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-02 10:50:15 -07:00
e0ab962d81
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-02 10:50:13 -07:00
f984d28e0c
Cleanly handle --with-linux=NONE and --with-spl=NONE options
...
when used to generate source rpms. These should not be fatal
because we actually don't need them until we build the source
rpm. When doing mock build this is important because these
dependent rpms will only be installed if they are specificed
in the source rpms spec file.
2009-07-02 10:44:43 -07:00
306984ea51
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-07-01 14:42:34 -07:00
5f0e7d8d62
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-07-01 14:42:33 -07:00
99029c5fdc
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-07-01 14:42:27 -07:00
d0c6b95287
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-01 14:42:26 -07:00
82eec484b1
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-07-01 14:42:21 -07:00
Brian Behlendorf