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
428870ff73
Update core ZFS code from build 121 to build 141.
2010-05-28 13:45:14 -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
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
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
82cd3659a2
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-23 11:49:58 -08:00
5a0a9cc451
Update makefiles
2008-12-23 11:47:33 -08:00
515c1981f2
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-11 14:59:39 -08:00
593aa3e10d
Move all current Makefiles to correct locations, updates still needed
2008-12-11 14:55:55 -08:00
94e1055395
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-11 14:04:54 -08:00
98ce19f04c
Update avl, nvpair, spl to unique build dirs
2008-12-11 13:54:57 -08:00
5bb8f9ec25
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-11 11:36:00 -08:00
172bb4bd5e
Move the world out of /zfs/ and seperate out module build tree
2008-12-11 11:08:09 -08:00
Brian Behlendorf
Ricardo M. Correia