5ee8a85ba6
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-16 10:30:27 -07:00
9818e69640
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2009-03-16 10:12:01 -07:00
2924858552
Remove two self referential functions.
...
Newer versions of gcc (4.3.0) detected the following unused
code segments.
2009-03-16 10:02:06 -07:00
9141a4f2c8
Refresh autogen products
2009-03-13 09:56:09 -07:00
4d5171b7f3
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-13 09:51:42 -07:00
adaf659f27
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-13 09:51:37 -07:00
caba3cb67e
Update specific asm-* arch to generic i386.
...
Depending on your x86 architecture $target_cpu can evaluate to
any of the following (i386|i486|i586|i686). Since our local asm
uses only i386 instructions sed is used to map all of these to
i386 and sets $target_arch. Other arch's are not impacted.
2009-03-13 09:41:55 -07:00
7fa1ced508
Refresh autogen products, remove stray zdump Makefile.in
2009-03-12 16:48:12 -07:00
0fe418c548
Refresh autogen products
2009-03-12 15:55:23 -07:00
6a1223268c
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-12 15:47:43 -07:00
640eb1d542
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-12 15:47:07 -07:00
c399ce1af8
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-12 15:46:45 -07:00
c6c2cf2b51
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-12 15:45:29 -07:00
9e4850e3d1
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-12 15:44:54 -07:00
5a7e7e9d3b
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 15:44:18 -07:00
82ce8b00f3
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 15:44:14 -07:00
6a5acaa105
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 15:44:13 -07:00
9fe5b916e2
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2009-03-12 15:39:27 -07:00
9e49df6b20
Add gcc-fortify-source branch
2009-03-12 15:38:51 -07:00
6a4aa2eab1
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-12 15:29:39 -07:00
574ed0e0b7
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-12 15:29:01 -07:00
a5326d0d28
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-12 15:28:42 -07:00
cc0c97146c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-12 15:27:28 -07:00
d830f4bf24
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-12 15:26:54 -07:00
d66ce12199
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 15:26:18 -07:00
379d9cf34d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 15:26:15 -07:00
6a59551cb7
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-12 15:26:13 -07:00
c4e10eb3df
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2009-03-12 15:21:30 -07:00
f1f9c50dd9
Add fix-strncat branch which corrects a buffer overrun.
2009-03-12 15:20:26 -07:00
c856450b52
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-12 15:15:45 -07:00
4e4fbfe52c
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-12 15:15:10 -07:00
0a6d02c2b9
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-12 15:15:08 -07:00
cd52c92666
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-12 15:14:46 -07:00
224d1bc012
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-12 15:13:35 -07:00
74a134347a
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-12 15:13:02 -07:00
35b117277d
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 15:12:26 -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
808e542240
Refresh autogen products
2009-03-12 11:06:21 -07:00
635e9ba8a0
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-12 10:41:10 -07:00
3d35752b2b
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-12 10:40:32 -07:00
fbbb5fe669
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-12 10:40:09 -07:00
2ff032fd60
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-12 10:38:44 -07:00
45f3d2a2a4
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-12 10:38:05 -07:00
9bdbd7c8f7
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 10:37:18 -07:00
b9b399bf04
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 10:37:14 -07:00
a03187bb3b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 10:37:12 -07:00
f8fe8a76f4
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-03-12 10:37:11 -07:00
cabd4a69c4
Resolve remaining uninitialized variables
...
Most of these fixes appear to be harmless and should never occur.
However, there were a few cases in this patch which do concern me,
I doubt we're seeing them but they look possible... mainly in the
user tools.
2009-03-12 10:30:41 -07:00
282a0b0995
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-12 10:03:50 -07:00
df8e13b5bd
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-12 10:03:02 -07:00
77695eacc1
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-12 10:02:45 -07:00
165b2611d2
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-12 10:01:25 -07:00
dcc25c44da
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-12 10:00:48 -07:00
0cdc14e427
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 10:00:07 -07:00
dd30dba016
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 10:00:04 -07:00
193ea156e9
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 10:00:03 -07:00
eceaf813ad
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-03-12 10:00:01 -07:00
f2d72af596
Add remaining missing cases (or a default) to all switch statements.
...
The previous code was not wrong, but this prevents gcc from warning
us about missing cases for these known safe switch statements. The
-Wno-missing-cases can now be removed to detect places where we
accidentally forgot a case.
2009-03-12 09:53:08 -07:00
0b5ddcfdca
Refresh autogen products
2009-03-11 22:31:29 -07:00
4acf3b07c0
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 22:30:41 -07:00
53b7082303
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-03-11 22:28:01 -07:00
426ed71564
Pull unused function under HAVE_LIBEFI ifdef.
2009-03-11 22:17:38 -07:00
378663e310
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 21:03:25 -07:00
da324afb34
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-11 21:02:49 -07:00
b392fd33fd
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-11 21:02:27 -07:00
b6616bd2c6
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-11 21:01:03 -07:00
9c4cc2ae78
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-11 21:00:25 -07:00
c351352990
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-11 20:59:46 -07:00
4c042de40b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 20:59:43 -07:00
60ac8152fe
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 20:59:42 -07:00
9915249546
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2009-03-11 20:53:11 -07:00
d4dbc7dca8
Resolve all instances of missing braces.
2009-03-11 20:52:21 -07:00
786894010a
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 14:58:37 -07:00
2ba55e86c5
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-11 14:58:34 -07:00
db42bfe00a
Fixed compilation error due to missing xdr_control() implementation in Linux.
2009-03-11 14:53:41 -07:00
03c7c8e4a9
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 14:45:01 -07:00
f39adcbb54
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
2009-03-11 14:44:59 -07:00
76052e446c
Revert 'linux-have-xdr' topic branch patch.
...
This is not needed anymore since a proper XDR implementation was added
to the SPL as of version spl-0.4.3.
2009-03-11 14:39:10 -07:00
8cb718a76c
Refresh autogen products
2009-03-11 14:25:09 -07:00
3f8174047a
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 14:13:57 -07:00
962c862580
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-11 14:13:07 -07:00
330dbde81a
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-11 14:12:39 -07:00
94dfc4263d
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-03-11 14:11:18 -07:00
ab760deda7
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-11 14:10:39 -07:00
cac68bc478
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-11 14:09:49 -07:00
5afc3db3ce
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-11 14:08:57 -07:00
1ca6578ebc
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 14:08:51 -07:00
8a3b1a5ff5
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 14:08:50 -07:00
e5011401cd
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-03-11 14:08:48 -07:00
3226eea157
Resolve additional cases where gcc wants extra parenthesis.
...
These were introduced by the rebase to b108.
2009-03-11 13:57:47 -07:00
b8dd7de0b5
Refresh autogen products
2009-03-11 13:30:38 -07:00
75cd2f2a81
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 12:22:35 -07:00
d57bb8312d
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-11 12:22:30 -07:00
84b63f7730
Remove all #pragma idents from libspl.
2009-03-11 12:13:44 -07:00
8927c974cf
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 11:22:46 -07:00
3a23753b70
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-11 11:20:30 -07:00
261ca2beb9
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-11 11:19:58 -07:00
3cc7a2814d
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-03-11 11:18:23 -07:00
7a08ef9d52
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
...
Conflicts:
module/zfs/spa_boot.c
2009-03-11 11:17:23 -07:00
47e0037a8b
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-11 11:15:59 -07:00
bf200630f9
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
module/zfs/rrwlock.c
module/zfs/spa_boot.c
module/zfs/zfs_replay.c
2009-03-11 11:12:24 -07:00
dff484a388
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 11:09:13 -07:00
5f30a3cb0e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 11:09:11 -07:00
8fe801fd8f
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-03-11 11:00:42 -07:00
af45030850
Added 'gcc-ident-pragmas' branch.
2009-03-11 10:59:45 -07:00
6980b84ea9
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 10:55:09 -07:00
0c8622c47c
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-11 10:55:05 -07:00
4a118b6227
Minor bug fix due to MAXOFFSET_T constant being too large on 32-bit systems.
2009-03-11 10:47:20 -07:00
d5fd9f25a3
Refresh autogen products
2009-03-10 22:09:49 -07:00
b775e4c206
Refresh autogen products
2009-03-10 22:04:11 -07:00
d9480e2bd0
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-10 22:03:06 -07:00
2d37cf7361
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-10 22:03:01 -07:00
c05c1aa6f9
Build system and packaging (RPM support) (Part 4)
...
Complete support for dist install srpm and rpm make targets.
2009-03-10 21:57:56 -07:00
401cd9e1d4
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-10 21:31:09 -07:00
7ca5d85ab6
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-10 21:30:24 -07:00
171086af52
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-10 21:28:53 -07:00
f65339a529
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-03-10 21:27:34 -07:00
e610bf6e09
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-10 21:26:59 -07:00
64c77b5cdb
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-10 21:26:14 -07:00
36860ec1a8
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
module/Makefile.in
2009-03-10 21:23:17 -07:00
c8e569dd1c
Build system and packaging (RPM support) (Part 2)
...
Complete support for dist install srpm and rpm make targets.
2009-03-10 21:13:30 -07:00
e1b736ecc8
Refresh autogen products
2009-03-10 11:42:01 -07:00
fc98c23a11
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-18 16:06:54 -08:00
da2df72c28
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-02-18 16:06:49 -08:00
2cd31b723e
Add HW_HOSTID_LEN for libspl use
2009-02-18 16:00:50 -08:00
5511b1d96d
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-18 15:24:04 -08:00
5164741b40
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-02-18 15:23:29 -08:00
a6fbd61ff1
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-02-18 15:23:07 -08:00
03f8c8f94b
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-02-18 15:22:04 -08:00
b878be0ee1
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-02-18 15:21:35 -08:00
e77f9a10a9
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-02-18 15:20:53 -08:00
e60db6f9dd
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-02-18 15:20:14 -08:00
830ac5b109
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-02-18 15:20:11 -08:00
6f8f3b5532
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-02-18 15:20:10 -08:00
9d4d22a26e
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-02-18 15:20:08 -08:00
8c228734a3
Fix cast
2009-02-18 15:15:56 -08:00
b4028a1bf5
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-18 14:38:55 -08:00
181fd4addc
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-02-18 14:37:16 -08:00
437bc77985
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-02-18 14:36:49 -08:00
a278e153c4
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-02-18 14:35:20 -08:00
9f4865e4ca
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-02-18 14:34:45 -08:00
f78c15d84f
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-02-18 14:34:03 -08:00
8090a9a908
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/zpool/zpool_main.c
2009-02-18 14:31:46 -08:00
7872d84be6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-02-18 14:30:54 -08:00
15f5ddebdf
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
...
Conflicts:
lib/libzpool/kernel.c
2009-02-18 14:29:08 -08:00
109a1d5b16
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-02-18 14:28:38 -08:00
6fe19bd252
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
...
Conflicts:
lib/libzpool/kernel.c
module/zfs/arc.c
2009-02-18 14:28:15 -08:00
f0a8aedfbc
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
...
Conflicts:
lib/libzpool/kernel.c
module/zfs/arc.c
2009-02-18 14:27:12 -08:00
3eb7fa9afd
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-02-18 14:04:08 -08:00
5be9e325a1
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:03:22 -08:00
ba528721da
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-02-18 13:12:58 -08:00
0b8e48b813
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-02-18 13:12:53 -08:00
e203e7b48f
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-02-18 13:12:35 -08:00
f686a87058
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/arc.c
2009-02-18 13:12:26 -08:00
3b17164f71
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
module/zfs/vdev.c
module/zfs/zio.c
2009-02-18 13:09:32 -08:00
d164b20935
Rebase master to b108
2009-02-18 12:51:31 -08:00
8278b2e2a8
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-03 09:46:50 -08:00
27e7565a93
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-02-03 09:46:46 -08:00
3d86fad730
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-02-03 09:46:36 -08:00
9cd029b543
Remove mknod from library.
...
This is all nowhandled in the SPL. When HAVE_GPL_ONLY_SYMBOLS is defined
because the module license is set to GPL we can leverage the udev interfaces
which will create the device. When HAVE_GPL_ONLY_SYMBOLS is not defined
we resort to an ugly hack and the SPL invokes a usermode helper to create
to missing device file for us in /dev/. Using GPL version modules is off
course preperable when possible.
2009-02-03 09:38:53 -08:00
1d4ad2d62e
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-16 14:56:15 -08:00
ca804c66f8
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-01-16 14:55:26 -08:00
7c5b7d2a94
This should always be success when zvol support is disabled
2009-01-16 14:52:35 -08:00
f863f8f848
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-15 14:22:27 -08:00
389b037e7a
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-01-15 14:22:01 -08:00
df7ad715a9
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-01-15 14:21:49 -08:00
476261f2d5
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-15 14:21:18 -08:00
2c83372734
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-15 14:21:11 -08:00
091a4a4ca4
Resolve conflict with removed cleaner type
2009-01-15 14:20:49 -08:00
cb8e50168e
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-15 14:19:06 -08:00
1f372d9030
Resolve conflict with removed cleaner type
2009-01-15 14:18:01 -08:00
ddaad20220
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:16:23 -08:00
a42707fcc0
Resolve conflict with removed cleaner type
2009-01-15 14:16:03 -08:00
48a55a0a10
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-01-15 14:13:54 -08:00
551838a6c8
Resolve conflict with removed cleaner type
2009-01-15 14:13:39 -08:00
da7151a89e
Resolve conflict with removed cleaner type
2009-01-15 14:11:19 -08:00
7b54fe44dc
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-01-15 14:05:38 -08:00
977fef2ba7
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-01-15 14:05:32 -08:00
2f36bf5af4
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-01-15 14:05:29 -08:00
35a269c06c
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-01-15 14:05:26 -08:00
a2e601c6e3
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-01-15 14:04:39 -08:00
3fa768e21b
Resolve conflict with removed cleaner type
2009-01-15 14:04:35 -08:00
d3df6b2012
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-01-15 14:01:51 -08:00
fb5f0bc833
Rebase master to b105
2009-01-15 13:59:39 -08:00
922f424be6
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-14 14:27:46 -08:00
aff2252263
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-14 14:27:42 -08:00
fd93449de9
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-01-14 14:27:31 -08:00
4fdb04d0a1
A little hackery to handle using zdb when the module stack isn't loaded. This is a hack and should be addressed upstream, zdb should not be attempting to initialize services it doesn't need
2009-01-14 14:25:25 -08:00
e972830059
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-14 12:06:46 -08:00
e6746c2609
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-01-14 12:06:41 -08:00
3764ec0e1e
Fixed sizeof() issue and minor cleanup
2009-01-14 12:03:03 -08:00
8778a30cda
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-14 10:42:47 -08:00
97073208f8
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-01-14 10:42:45 -08:00
bdde0d9d40
Return success here not failure
2009-01-14 10:37:35 -08:00
9716031521
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-13 09:55:44 -08:00
7f9ce14e58
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-13 09:55:40 -08:00
09b6f64e2d
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-01-13 09:55:30 -08:00
ef6d827a88
Don't check HAVE_SPL unavailable in userspace build
2009-01-13 09:53:35 -08:00
d68ed9fc41
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-09 16:54:22 -08:00
a62a385848
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-09 16:54:15 -08:00
13ab1d30be
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-01-09 16:53:53 -08:00
e22bfeab4e
Update load/unload message, mknod /dev/zfs when udev is unavailable
2009-01-09 16:50:08 -08:00
5801f33f50
Refresh autogen products
2009-01-09 15:12:36 -08:00
e05d7c1e7e
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-09 15:12:00 -08:00
402405558a
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-09 15:11:56 -08:00
b8fc1110d1
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-01-09 15:11:48 -08:00
fce16fe818
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-01-09 15:11:38 -08:00
e86fa83ee6
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-09 15:11:16 -08:00
89cf8c8a67
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-09 15:11:11 -08:00
aa6c4ff685
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-09 15:10:59 -08:00
921ebaf7f7
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-09 15:10:43 -08:00
522fb18428
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-09 15:10:26 -08:00
6791a1ee34
I don't think we need this in userspace
2009-01-09 15:07:32 -08:00
347805ecd8
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-09 14:46:45 -08:00
a7e5f34acb
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-09 14:46:41 -08:00
7af644b8b3
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-01-09 14:46:32 -08:00
ca0b39e0e7
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-01-09 14:46:23 -08:00
d584ad239d
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-09 14:46:01 -08:00
4022f85bac
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-09 14:45:56 -08:00
be3a17e437
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-09 14:45:45 -08:00
8e1f5d7bec
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-09 14:45:29 -08:00
d315fcf28e
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-09 14:45:13 -08:00
ff09d64647
Pull all source in to be built, it will be ifdef'ed out as need by higher level topic branches
2009-01-09 14:37:45 -08:00
9855548496
Refresh autogen products
2009-01-09 11:35:52 -08:00
2cc958820e
Refresh autogen products
2009-01-08 10:42:46 -08:00
62ce1a5d0e
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-08 10:29:29 -08:00
8a6f0ab272
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-08 10:29:23 -08:00
eba9726539
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-01-08 10:29:13 -08:00
b7256edf16
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-01-08 10:29:02 -08:00
e1a4af24af
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-08 10:28:37 -08:00
a43e0b50fb
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-08 10:28:32 -08:00
06749d1581
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-08 10:28:18 -08:00
c281c15c84
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-08 10:28:00 -08:00
b7d9adb500
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-08 10:27:42 -08:00
b457fb49f9
Remove vdev_disk from userspace build, vdev_file is used
2009-01-08 10:23:59 -08:00
4996278dd4
Refresh autogen products
2009-01-05 13:48:29 -08:00
46d1c1ff3d
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-05 13:47:32 -08:00
77c4ef21ab
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-05 13:47:29 -08:00
889bb92210
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-01-05 13:47:21 -08:00
eea4cc8e0e
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-01-05 13:47:12 -08:00
dbcb8f3921
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-05 13:46:51 -08:00
a9bfb78b5a
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-05 13:46:47 -08:00
3bc01c0326
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-05 13:46:35 -08:00
f88ab3c355
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-05 13:46:21 -08:00
80ed6c342d
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-05 13:46:06 -08:00
c15fa0ceb0
Add include paths
2009-01-05 13:44:26 -08:00
9eebf90277
Refresh autogen products
2009-01-05 13:40:25 -08:00
1f02aaba1c
Refresh autogen products
2009-01-05 12:47:00 -08:00
aaefbb4e76
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-05 12:45:45 -08:00
35cfc1bb85
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-05 12:45:38 -08:00
0f742dfc96
Refresh context
2009-01-05 12:45:17 -08:00
681ba5c296
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-01-05 12:41:42 -08:00
d5350109f4
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-05 12:40:55 -08:00
6ce317a8d5
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-05 12:40:48 -08:00
9c2bf69ecb
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-05 12:40:25 -08:00
c8fa7c9b23
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-05 12:39:56 -08:00
9a0cb95b1b
Resolve conflict
2009-01-05 12:38:23 -08:00
ce7115b807
Add unicode makefile references and support
2009-01-05 12:33:09 -08:00
ced77c2f1b
Add unicode makefile references and support
2009-01-05 12:32:55 -08:00
cbee2aba7e
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-05 11:54:54 -08:00
1b327abcfd
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-01-05 11:54:52 -08:00
3d2e086e21
Remove u8 support, moved to libu8
2009-01-05 11:52:51 -08:00
9403f4a605
Refresh autogen products
2008-12-23 12:39:25 -08:00
d8c0d57440
Refresh autogen products
2008-12-23 10:41:37 -08:00
50735743b7
Err undo that
2008-12-22 16:22:28 -08:00
bb128e51e6
Use thread so we can add other goodies beyond simply the pthread base
2008-12-22 16:20:36 -08:00
fccc852847
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 15:21:13 -08:00
53f2b61ce1
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-22 15:21:10 -08:00
89585b82fa
Add missing limits
2008-12-22 15:17:57 -08:00
29baca7561
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 15:06:45 -08:00
3251158230
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-22 15:06:42 -08:00
091c16c185
Add missing tzfile.h
2008-12-22 15:04:47 -08:00
9481daedcd
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 14:59:09 -08:00
314e57ba29
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-22 14:59:06 -08:00
b0704f1597
Add missing header for ztest
2008-12-22 14:57:15 -08:00
d46a4ba0dc
Refresh autogen products
2008-12-22 14:55:05 -08:00
f23a920ddd
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 14:45:48 -08:00
97e7199aaf
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2008-12-22 14:45:43 -08:00
ef6c136edb
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-22 14:45:33 -08:00
fccd2786e1
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-22 14:45:23 -08:00
12573fb5b9
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-22 14:44:59 -08:00
c267d86b09
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-22 14:44:55 -08:00
16d3bec487
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-22 14:44:42 -08:00
997a274a13
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 14:44:25 -08:00
ff8a2f61ff
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 14:44:07 -08:00
29b47d366e
Remove some headers
2008-12-22 14:42:02 -08:00
75b5893ca5
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 13:53:09 -08:00
139792e6b2
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2008-12-22 13:53:03 -08:00
fa078fa9dd
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-22 13:52:53 -08:00
7edc6e24a8
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-22 13:52:42 -08:00
262e367cd5
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-22 13:52:16 -08:00
877699acb1
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-22 13:52:11 -08:00
1f72057409
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-22 13:51:57 -08:00
52bfcda357
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 13:51:39 -08:00
05fafc638f
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 13:51:21 -08:00
90e5216ea9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 13:51:17 -08:00
035e4d373e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-22 13:51:16 -08:00
c9597f9a4f
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2008-12-22 13:51:15 -08:00
6bed331e59
More compat changes
2008-12-22 13:47:58 -08:00
d1178104fb
Refresh autogen products
2008-12-22 12:55:48 -08:00
d259de062c
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 12:55:11 -08:00
0789abcd67
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2008-12-22 12:55:06 -08:00
57e03b4986
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-22 12:54:57 -08:00
bc90a3635d
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-22 12:54:46 -08:00
a40064cfd1
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-22 12:54:21 -08:00
b7770e3b13
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-22 12:54:16 -08:00
34f30113a8
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-22 12:54:03 -08:00
195c61d105
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 12:53:46 -08:00
b93191445c
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 12:53:27 -08:00
121effcbee
Pull everything in to the Makefile
2008-12-22 12:51:03 -08:00
02d41bf31e
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 12:27:04 -08:00
1e9c6b3020
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2008-12-22 12:24:47 -08:00
79491b69f4
Start linux-have-zpl layer
2008-12-22 12:23:27 -08:00
08a400676b
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 12:09:15 -08:00
a6d6f31db6
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-22 12:09:08 -08:00
d7d260b870
Removing branch to readd under new name
2008-12-22 12:05:11 -08:00
4f1e40767b
Refresh autogen products
2008-12-22 11:46:00 -08:00
31ff40b9ec
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 11:42:32 -08:00
d7fafdb56e
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-22 11:42:23 -08:00
300ff503d4
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-22 11:42:13 -08:00
7b4bf789e9
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-22 11:41:50 -08:00
6d13a998fb
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-22 11:41:45 -08:00
86392b70ad
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-22 11:41:40 -08:00
187be3051e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-22 11:41:27 -08:00
7f2da73568
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 11:41:11 -08:00
aece7f6822
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 11:40:54 -08:00
7047bb0678
Add missing files from Makefile.am
2008-12-22 11:36:48 -08:00
0e72235081
Refresh autogen products
2008-12-22 10:40:25 -08:00
ebdd4dacfa
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 10:37:51 -08:00
01dee27561
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-22 10:37:44 -08:00
4e564d755b
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2008-12-22 10:37:42 -08:00
7e800d8125
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2008-12-22 10:37:33 -08:00
8ad9104988
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-22 10:37:10 -08:00
5169758856
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-22 10:37:05 -08:00
c6e93310af
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-22 10:37:00 -08:00
bdbd91fe46
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-22 10:36:48 -08:00
11147f632c
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-22 10:36:32 -08:00
9c47372b96
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-22 10:36:15 -08:00
5f0a629790
Add enable_extended_FILE_stdio #define
2008-12-22 10:34:22 -08:00
10911f9d71
Add missing sources
2008-12-22 10:27:41 -08:00
64359e919d
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 10:15:22 -08:00
42344f04c1
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-22 10:15:20 -08:00
8fdc6ee079
Stub out two more funcs until zpl support exists
2008-12-22 10:13:31 -08:00
6b0aac60eb
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 10:03:24 -08:00
0ecac4865c
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-22 10:03:22 -08:00
e8b703cb46
Add sys/time.h
2008-12-22 10:00:01 -08:00
3b465d5229
Refresh autogen products
2008-12-19 17:05:29 -08:00
fd8e8eb804
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-19 16:57:58 -08:00
783faf9040
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2008-12-19 16:57:45 -08:00
Brian Behlendorf
Ricardo M. Correia