Brian Behlendorf
97fe449387
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-07-27 10:49:19 -07:00
Brian Behlendorf
a9b7469efc
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-27 10:49:17 -07:00
Brian Behlendorf
0058e1070d
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-27 10:49:15 -07:00
Brian Behlendorf
f338939725
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-27 10:49:01 -07:00
Brian Behlendorf
a4ceefffcf
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-27 10:48:59 -07:00
Brian Behlendorf
69f433a07f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-27 10:48:58 -07:00
Brian Behlendorf
2a1e13463d
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-07-27 10:48:40 -07:00
Brian Behlendorf
e5a2c40d78
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-07-27 10:48:35 -07:00
Brian Behlendorf
f31a93b03a
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-07-27 10:48:28 -07:00
Brian Behlendorf
0b83bf0a41
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-07-27 10:48:26 -07:00
Brian Behlendorf
2d49686a7d
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-07-27 10:48:19 -07:00
Brian Behlendorf
4ffff8b0c5
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-27 10:48:17 -07:00
Brian Behlendorf
2d6739a8bb
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-07-27 10:48:05 -07:00
Brian Behlendorf
7dba45275d
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-07-27 10:47:59 -07:00
Brian Behlendorf
6462601604
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-07-27 10:47:50 -07:00
Brian Behlendorf
05f81e4861
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-27 10:47:49 -07:00
Brian Behlendorf
3cea70067c
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-07-27 10:47:41 -07:00
Brian Behlendorf
7c91c1a509
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-07-27 10:47:39 -07:00
Brian Behlendorf
c7384d6b2e
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-27 10:47:31 -07:00
Brian Behlendorf
4bea4f6945
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-27 10:47:28 -07:00
Brian Behlendorf
3a431c68c2
Remove LINUXINCLUDE from autoconf wrapper, breaks 2.6.28+ kernels.
...
Modern kernel build systems at least post 2.6.16 will set this properly
so we should not. In fact post 2.6.28 the include headers have moved
under arch so the guess we make here is completely wrong. Letting
the kernel build system set this ensure it will be correct. Also
drop the ulimit from the Makefile which, not surprisingly, turns out
to be very non-portable. If your expecting failures set the ulimit
in your shell before kicking off the test suite.
2009-07-27 10:39:28 -07:00
Brian Behlendorf
2c29ff1450
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-07-24 16:36:56 -07:00
Brian Behlendorf
fcf48bdadd
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-07-24 16:36:54 -07:00
Brian Behlendorf
33a64b4287
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-07-24 16:36:47 -07:00
Brian Behlendorf
0afce1c579
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-07-24 16:36:45 -07:00
Brian Behlendorf
b957969454
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-07-24 16:36:39 -07:00
Brian Behlendorf
f0c41ca00b
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-24 16:36:33 -07:00
Brian Behlendorf
0943fd4df1
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-07-24 16:36:22 -07:00
Brian Behlendorf
0d007e3d6e
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-07-24 16:36:20 -07:00
Brian Behlendorf
a70274b109
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-24 16:36:13 -07:00
Brian Behlendorf
c64709d0d8
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-07-24 16:36:12 -07:00
Brian Behlendorf
c7cc167c00
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-07-24 16:36:04 -07:00
Brian Behlendorf
cca382ac97
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-24 16:36:02 -07:00
Brian Behlendorf
2a5a054bcc
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-07-24 16:35:55 -07:00
Brian Behlendorf
89d4dd2436
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-24 16:35:52 -07:00
Brian Behlendorf
aba8e5b0ed
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-07-24 16:35:45 -07:00
Brian Behlendorf
c47e9699a7
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-24 16:35:43 -07:00
Brian Behlendorf
dc31795039
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-07-24 16:35:36 -07:00
Brian Behlendorf
4fbb77c38d
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-07-24 16:35:34 -07:00
Brian Behlendorf
5bcad95827
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-07-24 16:35:27 -07:00
Brian Behlendorf
a9a8312f4b
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-24 16:35:26 -07:00
Brian Behlendorf
2f11d17f52
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-07-24 16:35:18 -07:00
Brian Behlendorf
1fba9cdbd8
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-24 16:35:11 -07:00
Brian Behlendorf
0d2aff5745
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-07-24 16:35:03 -07:00
Brian Behlendorf
38cd7a5321
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-24 16:35:01 -07:00
Brian Behlendorf
d7f0e6e424
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-07-24 16:34:54 -07:00
Brian Behlendorf
d157e88600
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-24 16:34:53 -07:00
Brian Behlendorf
6a636618e9
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-24 16:34:52 -07:00
Brian Behlendorf
8098468a69
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-24 16:34:39 -07:00
Brian Behlendorf
025ffd0a06
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-24 16:34:37 -07:00