Brian Behlendorf
|
2eae99e9eb
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-15 16:31:30 -08:00 |
|
Brian Behlendorf
|
2712912cb8
|
Use old autoconf stratagy
|
2008-12-15 16:27:22 -08:00 |
|
Brian Behlendorf
|
3ae13f718f
|
Resolve conflict
|
2008-12-15 10:57:47 -08:00 |
|
Brian Behlendorf
|
06418073d4
|
Move libefi check to libefi topic branch
|
2008-12-15 10:54:53 -08:00 |
|
Brian Behlendorf
|
1fbf3f3c97
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:51:59 -08:00 |
|
Brian Behlendorf
|
d43dd792fe
|
Fixing user config
|
2008-12-15 10:50:06 -08:00 |
|
Brian Behlendorf
|
b7f7d8e06a
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:47:28 -08:00 |
|
Brian Behlendorf
|
ce1541961c
|
Resolve context
|
2008-12-15 10:47:24 -08:00 |
|
Brian Behlendorf
|
08e26341a4
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:46:31 -08:00 |
|
Brian Behlendorf
|
6661907d23
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-15 10:46:30 -08:00 |
|
Brian Behlendorf
|
c543b4ec69
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:46:27 -08:00 |
|
Brian Behlendorf
|
df233ea16e
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-15 10:46:25 -08:00 |
|
Brian Behlendorf
|
b4c44a2119
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:46:22 -08:00 |
|
Brian Behlendorf
|
10a221262d
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-15 10:46:21 -08:00 |
|
Brian Behlendorf
|
c7c5a9a24f
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:46:17 -08:00 |
|
Brian Behlendorf
|
de445f95b2
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-15 10:46:16 -08:00 |
|
Brian Behlendorf
|
17024357dd
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:46:13 -08:00 |
|
Brian Behlendorf
|
9275a11b74
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-15 10:46:12 -08:00 |
|
Brian Behlendorf
|
e200299d07
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:46:08 -08:00 |
|
Brian Behlendorf
|
afa10c2e57
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-15 10:46:07 -08:00 |
|
Brian Behlendorf
|
0af19a15ed
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:46:04 -08:00 |
|
Brian Behlendorf
|
0bbd576b6f
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-15 10:46:03 -08:00 |
|
Brian Behlendorf
|
69c54437ee
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:45:59 -08:00 |
|
Brian Behlendorf
|
ea968856f7
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-15 10:45:58 -08:00 |
|
Brian Behlendorf
|
06a4bfff9d
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:45:55 -08:00 |
|
Brian Behlendorf
|
798ed6ad97
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-15 10:45:54 -08:00 |
|
Brian Behlendorf
|
bb0f8b0dae
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:45:50 -08:00 |
|
Brian Behlendorf
|
34a42233dd
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-15 10:45:49 -08:00 |
|
Brian Behlendorf
|
da024364e9
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-15 10:45:48 -08:00 |
|
Brian Behlendorf
|
e28c74f1fa
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:45:43 -08:00 |
|
Brian Behlendorf
|
f42b935bc0
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-15 10:45:41 -08:00 |
|
Brian Behlendorf
|
ac9698d207
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-15 10:45:41 -08:00 |
|
Brian Behlendorf
|
e6e59166e4
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:45:35 -08:00 |
|
Brian Behlendorf
|
620925b64d
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-15 10:45:34 -08:00 |
|
Brian Behlendorf
|
4fe992ea29
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:45:31 -08:00 |
|
Brian Behlendorf
|
15f287198e
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-15 10:45:29 -08:00 |
|
Brian Behlendorf
|
0060220c71
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:45:26 -08:00 |
|
Brian Behlendorf
|
6e0de77777
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-15 10:45:25 -08:00 |
|
Brian Behlendorf
|
463cdf3fb5
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:45:22 -08:00 |
|
Brian Behlendorf
|
be12590dfd
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-15 10:45:20 -08:00 |
|
Brian Behlendorf
|
0f919f32f1
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:45:17 -08:00 |
|
Brian Behlendorf
|
b379b93d47
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-15 10:45:16 -08:00 |
|
Brian Behlendorf
|
17d42bb690
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:45:13 -08:00 |
|
Brian Behlendorf
|
280b30668d
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-15 10:45:11 -08:00 |
|
Brian Behlendorf
|
ae9906f48d
|
Context fix
|
2008-12-15 10:44:33 -08:00 |
|
Brian Behlendorf
|
0dd88aae8a
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-15 10:43:06 -08:00 |
|
Brian Behlendorf
|
574e2cec0d
|
Minor context change to ease merging
|
2008-12-15 10:41:15 -08:00 |
|
Brian Behlendorf
|
2bdf9cfae3
|
Moving all kernel+user configure magic to the correct topic branches where the features are introduced or needed
|
2008-12-15 10:40:22 -08:00 |
|
Brian Behlendorf
|
eedcea2c84
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 10:36:29 -08:00 |
|
Brian Behlendorf
|
e46c8e90ef
|
config/user.m4
|
2008-12-15 10:34:33 -08:00 |