a740d2a8f7
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/Makefile.am
2009-10-09 16:06:51 -07:00
a0337cfcd8
Add libefi library in to the build system.
2009-10-09 15:58:45 -07:00
0d8bb46b58
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-10-09 15:03:53 -07:00
6ef15db027
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-10-09 15:03:50 -07:00
f73cff230f
Reverting changes on linux-have-libefi topic branch.
2009-10-09 14:59:05 -07:00
ae556c9174
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-08-18 13:01:34 -07:00
8b02e1a43f
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-08-18 12:35:12 -07:00
2d067983d6
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-08-18 12:29:48 -07:00
f301459f0e
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-08-18 12:29:32 -07:00
c67303e092
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/dsl_dataset.c
module/zfs/rrwlock.c
module/zfs/spa_history.c
module/zfs/zfs_ioctl.c
2009-08-18 12:26:09 -07:00
50c623ccef
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-18 12:10:55 -07:00
b99b422796
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-18 12:08:58 -07:00
c5b5d32d69
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
...
Conflicts:
module/zfs/vdev_raidz.c
2009-08-18 12:06:21 -07:00
e5e4fadc34
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/dmu.c
module/zfs/dsl_deleg.c
module/zfs/rrwlock.c
module/zfs/vdev_raidz.c
2009-08-18 12:04:53 -07:00
45d1cae3b8
Rebase master to b121
2009-08-18 11:43:27 -07:00
1f8a43f7a2
Refresh autogen products
2009-08-17 21:58:33 -07:00
535dab57d2
Refresh autogen products.
2009-07-29 17:54:49 -07:00
8feebe7d65
Refresh autogen products
2009-07-16 10:29:59 -07:00
c58b9ed603
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-07-06 15:21:26 -07:00
409cfe5051
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
...
Conflicts:
lib/libzfs/libzfs_pool.c
2009-07-06 15:05:47 -07:00
053043b2d0
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
...
Conflicts:
lib/libzfs/libzfs_pool.c
2009-07-06 13:44:19 -07:00
a33c6c25d2
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-07-06 13:43:22 -07:00
149c4b2731
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
lib/libzfs/libzfs_pool.c
module/zcommon/zfs_namecheck.c
module/zfs/dmu.c
module/zfs/include/sys/dmu.h
module/zfs/include/sys/zfs_fuid.h
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zap_micro.c
module/zfs/zfs_fuid.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_vfsops.c
module/zfs/zfs_znode.c
2009-07-06 13:40:29 -07:00
658459249e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-06 13:17:28 -07:00
a1ccb00b7e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
module/zfs/zil.c
2009-07-06 13:11:34 -07:00
44703f0029
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/arc.c
module/zfs/spa.c
2009-07-02 16:57:09 -07:00
e2b2597751
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
cmd/zdb/zdb_il.c
cmd/zfs/zfs_main.c
cmd/zinject/zinject.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_graph.c
module/zcommon/include/sys/fm/fs/zfs.h
module/zcommon/include/zfs_deleg.h
module/zcommon/include/zfs_namecheck.h
module/zcommon/zfs_deleg.c
module/zcommon/zfs_namecheck.c
module/zcommon/zprop_common.c
module/zfs/arc.c
module/zfs/dmu.c
module/zfs/dmu_object.c
module/zfs/dmu_objset.c
module/zfs/dsl_pool.c
module/zfs/dsl_prop.c
module/zfs/fletcher.c
module/zfs/include/sys/dsl_deleg.h
module/zfs/include/sys/dsl_prop.h
module/zfs/include/sys/metaslab_impl.h
module/zfs/include/sys/spa_boot.h
module/zfs/include/sys/zap.h
module/zfs/include/sys/zap_impl.h
module/zfs/include/sys/zfs_context.h
module/zfs/include/sys/zfs_ctldir.h
module/zfs/include/sys/zfs_dir.h
module/zfs/include/sys/zfs_fuid.h
module/zfs/include/sys/zfs_ioctl.h
module/zfs/spa.c
module/zfs/spa_errlog.c
module/zfs/spa_history.c
module/zfs/zap.c
module/zfs/zap_leaf.c
module/zfs/zap_micro.c
module/zfs/zfs_ioctl.c
module/zfs/zio.c
2009-07-02 16:49:11 -07:00
9babb37438
Rebase master to b117
2009-07-02 15:44:48 -07:00
e3d5b2a900
Refresh autogen products
2009-07-01 11:37:26 -07:00
80cfd98d8e
Refresh autogen products
2009-06-09 16:46:26 -07:00
26f70525ee
Refresh autogen products
2009-06-08 16:33:33 -07:00
15ae49cfcc
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-16 10:43:42 -07:00
10e245f03f
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
...
Conflicts:
cmd/zpool/zpool_main.c
2009-03-16 10:42:20 -07:00
e98228ab73
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-16 10:39:08 -07:00
dbbb5c2e4e
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-16 10:38:52 -07:00
c9cff73d9e
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/zpool/zpool_main.c
2009-03-16 10:32:12 -07:00
be112b3f57
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-16 10:30:31 -07:00
5ee8a85ba6
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-16 10:30:27 -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
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
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
fbbb5fe669
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-12 10:40:09 -07:00
45f3d2a2a4
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-12 10:38:05 -07:00
5f9ae91a8a
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-12 10:37:50 -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
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
dd82a3b6bc
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 23:10:09 -07:00
da4d2eea9d
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-03-11 23:10:06 -07:00
73db9f622c
Pull unused err variable under HAVE_DM_INUSE_SWAP ifdef.
2009-03-11 23:05:42 -07:00
77a1188aee
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 22:50:42 -07:00
0d19b2613b
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-03-11 22:50:31 -07:00
1c0279a08f
Resolve newly revealed unused vars and symbols caused by topic branch.
2009-03-11 22:43:09 -07:00
0b5ddcfdca
Refresh autogen products
2009-03-11 22:31:29 -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
b2041bc8ef
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-11 14:13:33 -07:00
330dbde81a
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-11 14:12:39 -07:00
cac68bc478
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-11 14:09:49 -07:00
0f0abc8d58
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-11 14:09:36 -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
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
8927c974cf
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 11:22:46 -07:00
af12291488
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
...
Conflicts:
module/zfs/rrwlock.c
module/zfs/zfs_replay.c
2009-03-11 11:22:11 -07:00
261ca2beb9
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-11 11:19:58 -07:00
47e0037a8b
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-11 11:15:59 -07:00
bc22a004ee
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-11 11:15:40 -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
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
e1b736ecc8
Refresh autogen products
2009-03-10 11:42:01 -07:00
b4028a1bf5
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-18 14:38:55 -08:00
7b8eca908f
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
...
Conflicts:
cmd/zpool/zpool_main.c
2009-02-18 14:38:20 -08:00
437bc77985
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-02-18 14:36:49 -08:00
f78c15d84f
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-02-18 14:34:03 -08:00
7e21796d7e
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-02-18 14:33:48 -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
f686a87058
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/arc.c
2009-02-18 13:12:26 -08:00
d164b20935
Rebase master to b108
2009-02-18 12:51:31 -08:00
f863f8f848
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-15 14:22:27 -08:00
adcb983918
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-15 14:22:14 -08:00
df7ad715a9
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-01-15 14:21:49 -08:00
cb8e50168e
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-15 14:19:06 -08:00
fd0e369487
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-01-15 14:19:00 -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
3fa768e21b
Resolve conflict with removed cleaner type
2009-01-15 14:04:35 -08:00
fb5f0bc833
Rebase master to b105
2009-01-15 13:59:39 -08:00
9855548496
Refresh autogen products
2009-01-09 11:35:52 -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
Brian Behlendorf
Ricardo M. Correia