e92d6d861f
Update linux-kernel-module with refreshed EXPORT_SYMBOLs
...
After such a large update many of the symbols which were previously
exported are no longer available, and several new symbols have been
added and are needed. Refresh to topic branch to reflect this.
2010-06-14 15:58:15 -07:00
24d1a8e0ed
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-14 15:53:43 -07:00
c430e23552
Update zfs-branch with build system updates
...
Required Makefile modifications for updated ZFS code.
2010-06-14 15:46:11 -07:00
97c49607ec
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
...
Conflicts:
module/zcommon/zfs_comutil.c
module/zfs/arc.c
module/zfs/dmu_objset.c
module/zfs/dmu_tx.c
module/zfs/dsl_dataset.c
module/zfs/dsl_dir.c
module/zfs/spa.c
module/zfs/spa_boot.c
module/zfs/spa_misc.c
module/zfs/vdev.c
module/zfs/zil.c
module/zfs/zio.c
2010-05-28 16:01:35 -07:00
812761eac5
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-05-28 15:46:10 -07:00
3e2be634a5
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
cmd/zdb/zdb.c
cmd/zdb/zdb_il.c
cmd/zfs/zfs_main.c
cmd/zfs/zfs_util.h
cmd/zinject/zinject.h
cmd/zpool/zpool_main.c
cmd/zpool/zpool_util.c
cmd/ztest/ztest.c
lib/libnvpair/include/libnvpair.h
lib/libnvpair/libnvpair.c
lib/libzfs/libzfs_changelist.c
lib/libzfs/libzfs_config.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_import.c
lib/libzfs/libzfs_mount.c
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_sendrecv.c
module/avl/avl.c
module/avl/include/sys/avl.h
module/nvpair/include/sys/nvpair.h
module/nvpair/nvpair.c
module/zcommon/include/zfs_comutil.h
module/zcommon/include/zfs_prop.h
module/zcommon/zfs_comutil.c
module/zfs/arc.c
module/zfs/dbuf.c
module/zfs/dmu.c
module/zfs/dmu_objset.c
module/zfs/dmu_zfetch.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/dsl_pool.c
module/zfs/dsl_prop.c
module/zfs/dsl_synctask.c
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/dmu_zfetch.h
module/zfs/include/sys/dsl_synctask.h
module/zfs/include/sys/refcount.h
module/zfs/include/sys/txg.h
module/zfs/include/sys/uberblock.h
module/zfs/include/sys/zap_leaf.h
module/zfs/include/sys/zfs_debug.h
module/zfs/include/sys/zfs_znode.h
module/zfs/include/sys/zio_compress.h
module/zfs/include/sys/zvol.h
module/zfs/lzjb.c
module/zfs/metaslab.c
module/zfs/refcount.c
module/zfs/sha256.c
module/zfs/spa.c
module/zfs/spa_boot.c
module/zfs/uberblock.c
module/zfs/vdev.c
module/zfs/zap_micro.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_replay.c
module/zfs/zio.c
module/zfs/zio_compress.c
2010-05-28 15:34:57 -07:00
957b7b41d4
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
cmd/zdb/zdb.c
cmd/ztest/ztest.c
module/zfs/dbuf.c
module/zfs/dsl_dataset.c
module/zfs/dsl_scrub.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zio.c
2010-05-28 14:19:22 -07:00
428870ff73
Update core ZFS code from build 121 to build 141.
2010-05-28 13:45:14 -07:00
6324adf280
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-28 12:43:01 -07:00
06da6ccf97
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-28 12:42:30 -07:00
c91169c7c5
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
...
Conflicts:
lib/libzfs/libzfs_util.c
2010-05-28 12:42:27 -07:00
fb72c6ef81
Revert gcc-shadow using -Wno-shadow I can live with
...
While I would rather fix all the instances where something is shadowed
it complicates tracking the OpenSolaris code where they either don't
seem to care or have different conflicts. Anyway, this ends up being
more simply gratutous change than I care for.
2010-05-28 12:34:45 -07:00
86705eb3e0
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-04-29 10:42:39 -07:00
1368594e11
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-04-29 10:41:59 -07:00
a3c2fb2333
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-04-29 10:41:02 -07:00
8c24800b72
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-04-29 10:40:36 -07:00
4aad8d3244
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-04-29 10:40:34 -07:00
fa42225a3d
Add Solaris FMA style support
2010-04-29 10:37:15 -07:00
c9aaaff23b
Move zfs_config.h include to command line -include
...
Remove the few places in the code where zfs_config.h is included.
It is now added to the gcc compile line to ensure the config results
are always available.
2010-03-22 16:48:16 -07:00
7121867aea
Configure checks for kernel build options incompatible with the license
...
Changes for linux-kernel-module topic branch, see commit fd75782
2010-03-08 10:45:19 -08:00
6e2c55b5a6
Update to use spl_module_{init,exit}() macro API.
2009-10-01 16:47:49 -07:00
954484f75d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
...
Conflicts:
module/zfs/dsl_dataset.c
module/zfs/spa_history.c
2009-08-18 12:32:53 -07:00
50c623ccef
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-18 12:10:55 -07:00
db89339134
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
...
Conflicts:
module/zfs/dmu.c
2009-08-18 12:07:23 -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
0f80e41c89
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
module/zfs/spa_misc.c
module/zfs/vdev_label.c
2009-08-18 11:55:36 -07:00
45d1cae3b8
Rebase master to b121
2009-08-18 11:43:27 -07:00
8bb9b8305a
Export new quota related symbols.
2009-07-10 11:38:53 -07:00
266a7d8cd7
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
...
Conflicts:
module/zcommon/zfs_namecheck.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zap_micro.c
2009-07-06 13:47:04 -07:00
658459249e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-06 13:17:28 -07:00
244d656e28
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
...
Conflicts:
module/zfs/dmu.c
2009-07-02 16:59:39 -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
e9f14862a5
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
module/zfs/dmu_objset.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/vdev_label.c
module/zfs/zio.c
2009-07-02 16:18:03 -07:00
9babb37438
Rebase master to b117
2009-07-02 15:44:48 -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
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
e610bf6e09
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-10 21:26:59 -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
53a6418874
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-07 15:52:31 -08:00
2a76f03369
Update distfiles
2009-01-07 15:49:36 -08:00
b2db87f254
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-05 15:45:05 -08:00
760d78b9f8
Move default include paths after custom include paths so local stuff gets picked up first
2009-01-05 15:42:56 -08:00
9c2bf69ecb
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-05 12:40:25 -08:00
ce7115b807
Add unicode makefile references and support
2009-01-05 12:33:09 -08:00
f49886c003
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-23 13:13:29 -08:00
7725fe7431
Remove CPU_SEQID from context, available in SPL. Additionally add module magic for zcommon
2008-12-23 13:11:03 -08:00
e7e0111a7c
Update makefile
2008-12-23 13:07:27 -08:00
c22ff325ce
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-23 12:50:58 -08:00
Brian Behlendorf
Ricardo M. Correia