Brian Behlendorf
|
715ac6ca88
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:34:16 -08:00 |
|
Brian Behlendorf
|
7453ec0f2c
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-16 16:34:09 -08:00 |
|
Brian Behlendorf
|
8bed8da925
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-16 16:34:07 -08:00 |
|
Brian Behlendorf
|
2d7f255945
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-16 16:34:04 -08:00 |
|
Brian Behlendorf
|
ebab24f633
|
Resolve shadow conflict
|
2008-12-16 16:26:50 -08:00 |
|
Brian Behlendorf
|
6a902fe21c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:19:56 -08:00 |
|
Brian Behlendorf
|
f2bc2f7b6f
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-16 16:19:52 -08:00 |
|
Brian Behlendorf
|
fd4da48000
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-16 16:19:50 -08:00 |
|
Brian Behlendorf
|
29be0d44ba
|
Resolve conflict
|
2008-12-16 16:19:46 -08:00 |
|
Brian Behlendorf
|
4d21a1c977
|
Resolve two more shadow conflicts
|
2008-12-16 16:14:19 -08:00 |
|
Brian Behlendorf
|
4ee4891d66
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:10:16 -08:00 |
|
Brian Behlendorf
|
862436f8c9
|
Strip out userspace interface to mount the FS. I need to talk about the right way to manage these changes with the lustre group at Sun, and see where they stand
|
2008-12-16 16:06:24 -08:00 |
|
Brian Behlendorf
|
70c7936ebf
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 15:52:15 -08:00 |
|
Brian Behlendorf
|
e5000a1073
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:51:22 -08:00 |
|
Brian Behlendorf
|
12c13fbafb
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-16 15:51:20 -08:00 |
|
Brian Behlendorf
|
4583b6d5ba
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-16 15:51:19 -08:00 |
|
Brian Behlendorf
|
e14e140b52
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-16 15:51:19 -08:00 |
|
Brian Behlendorf
|
3c515284a6
|
Remove double declaration of char *
|
2008-12-16 15:49:21 -08:00 |
|
Brian Behlendorf
|
f73c835830
|
Add include patch to pick up fletcher.c which for some unknown reason is included instead of simply being build as source. This should be fixed eventually, but it is how the OpenSolaris source handles it.
|
2008-12-16 15:44:02 -08:00 |
|
Brian Behlendorf
|
7e43e16395
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:34:50 -08:00 |
|
Brian Behlendorf
|
35f607040f
|
Wrap additional new efi code in HAVE_LIBEFI macros
|
2008-12-16 15:33:00 -08:00 |
|
Brian Behlendorf
|
6e002c41b8
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:22:48 -08:00 |
|
Brian Behlendorf
|
a3ea268b72
|
Add 2 missing headers
|
2008-12-16 15:20:56 -08:00 |
|
Brian Behlendorf
|
ca161b928b
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 15:17:54 -08:00 |
|
Brian Behlendorf
|
36722eee12
|
Comment out most of the file until ZPL support arrives
|
2008-12-16 15:16:04 -08:00 |
|
Brian Behlendorf
|
6d01a82ce5
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:45:32 -08:00 |
|
Brian Behlendorf
|
ef919ac403
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:45:31 -08:00 |
|
Brian Behlendorf
|
66587f0fee
|
Remove all the share stuff
|
2008-12-16 14:43:38 -08:00 |
|
Brian Behlendorf
|
66cf9db3d0
|
Remove non-existing systeminfo ref
|
2008-12-16 14:38:52 -08:00 |
|
Brian Behlendorf
|
1f0ad04f2d
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:35:21 -08:00 |
|
Brian Behlendorf
|
dbd5e397c5
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-16 14:35:20 -08:00 |
|
Brian Behlendorf
|
e213f59844
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 14:34:51 -08:00 |
|
Brian Behlendorf
|
bb20fd94fc
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-16 14:34:17 -08:00 |
|
Brian Behlendorf
|
047a942f42
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:34:01 -08:00 |
|
Brian Behlendorf
|
79bc1b23ed
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-16 14:33:59 -08:00 |
|
Brian Behlendorf
|
804830a231
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-16 14:33:59 -08:00 |
|
Brian Behlendorf
|
a8a0f9ea2a
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-16 14:33:58 -08:00 |
|
Brian Behlendorf
|
9439fbdcd3
|
Add systeminfo
|
2008-12-16 14:32:03 -08:00 |
|
Brian Behlendorf
|
53c0cdbc42
|
Resolve dirname shadow conflict with /usr/include/libgen.h:27 dirname
|
2008-12-16 14:29:35 -08:00 |
|
Brian Behlendorf
|
2c2372389a
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:24:23 -08:00 |
|
Brian Behlendorf
|
7df95c2f31
|
Add missing header
|
2008-12-16 14:22:31 -08:00 |
|
Brian Behlendorf
|
e583bf8b9e
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:19:55 -08:00 |
|
Brian Behlendorf
|
f6207ec73a
|
Add missing headers
|
2008-12-16 14:17:29 -08:00 |
|
Brian Behlendorf
|
52a453edaa
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:12:48 -08:00 |
|
Brian Behlendorf
|
9df591c9d3
|
Add sys/mount.h header
|
2008-12-16 14:10:43 -08:00 |
|
Brian Behlendorf
|
554defd465
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 14:07:00 -08:00 |
|
Brian Behlendorf
|
12cb53ce52
|
Make SHARENFS condition with ZPL
|
2008-12-16 14:05:09 -08:00 |
|
Brian Behlendorf
|
ac3a2f3476
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-16 13:31:42 -08:00 |
|
Brian Behlendorf
|
33072dc1bc
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 13:31:13 -08:00 |
|
Brian Behlendorf
|
8342056a8a
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-16 13:30:38 -08:00 |