e4c2959728
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-12 15:12:49 -07:00
23d656adeb
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-03-12 15:12:43 -07:00
4defc1ecfa
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-12 15:12:40 -07:00
4750c97a3f
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-03-12 15:12:34 -07:00
37370afac3
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-03-12 15:12:32 -07:00
35b117277d
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 15:12:26 -07:00
949f353a63
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-12 15:12:23 -07:00
f2e7d57653
Packaging update
...
Make LINUX_VERSION available to Makefile's, add packaging
for user space include headers.
2009-03-12 15:07:29 -07:00
59541a305e
Libspl XDR implementation reorganization
...
Moved xdr_control() function from static inline in xdr.h in to a
new xdr.c file which was added to the libspl build. Additionally,
I have removed the 'xdr_bytesrec' typedef which shares the same
name as the struct. This is what Solaris does, but it's just asking
for trouble. It has been replaced with an 'xdr_bytesrec_t' typedef.
2009-03-12 14:38:52 -07:00
acb8d25a7b
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-03-12 11:05:13 -07:00
cf11eb7ae3
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-12 11:05:11 -07:00
26eae28eee
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-03-12 11:05:03 -07:00
9eea83e74b
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-12 11:04:58 -07:00
0637d80768
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-03-12 11:04:49 -07:00
c252d37734
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-03-12 11:04:44 -07:00
575b89cfce
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-12 11:04:38 -07:00
89f05671e0
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-12 11:04:36 -07:00
33749a1dd9
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-03-12 11:04:30 -07:00
86147fe705
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-12 11:04:28 -07:00
e415a6b67a
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-03-12 11:04:21 -07:00
278385bbbb
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-12 11:04:19 -07:00
f4a45ade2e
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-03-12 11:04:13 -07:00
7412a14181
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-12 11:04:05 -07:00
b7d549fab1
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-03-12 11:03:59 -07:00
d3f1b98b71
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-03-12 11:03:57 -07:00
cc2dc9d8d0
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-03-12 11:03:52 -07:00
043c170a2a
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-03-12 11:03:47 -07:00
3472b1a1c9
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-03-12 11:03:39 -07:00
85f0e24364
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-12 11:03:37 -07:00
11511db903
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-03-12 11:03:30 -07:00
730ac4d3cb
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-12 11:03:27 -07:00
6b12464509
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-03-12 11:03:22 -07:00
03e14b91d8
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-12 11:03:20 -07:00
dfda3c0c72
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-12 11:03:19 -07:00
35ec030c27
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-12 11:03:09 -07:00
7022b6b88d
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-12 11:03:07 -07:00
cb6e0ce601
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-12 11:03:06 -07:00
85e3d57446
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-03-12 11:02:53 -07:00
30e8d63a63
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-03-12 11:02:50 -07:00
22bf474eda
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-03-12 11:02:44 -07:00
95a38d1be5
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-03-12 11:02:42 -07:00
9959c589c7
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-03-12 11:02:36 -07:00
11cc8eec9a
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-12 11:02:34 -07:00
f348c23716
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-03-12 11:02:29 -07:00
99e1eb49cd
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-12 11:02:26 -07:00
b9b7fc504e
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-03-12 11:02:21 -07:00
af121cd19c
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-12 11:02:16 -07:00
bff648eff3
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-03-12 11:02:09 -07:00
686f4f3b01
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-03-12 11:02:06 -07:00
40efa4205e
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 11:02:01 -07:00
Brian Behlendorf