aab0acc933
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-03-22 16:56:58 -07:00
ef3c3d489f
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-03-22 16:56:51 -07:00
d954f179de
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-03-22 16:56:49 -07:00
a608242d71
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-03-22 16:56:41 -07:00
039764638e
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-22 16:56:39 -07:00
1a6447c024
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-03-22 16:56:32 -07:00
38b6b00574
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-22 16:56:30 -07:00
5b96c2f17f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-22 16:56:29 -07:00
7579933610
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-03-22 16:56:15 -07:00
df825ae53d
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-03-22 16:56:13 -07:00
57430e744d
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-03-22 16:56:06 -07:00
c455938200
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-03-22 16:56:04 -07:00
b4c5404bfd
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2010-03-22 16:55:57 -07:00
d49f8b0264
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-03-22 16:55:55 -07:00
6b9f42c3be
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-03-22 16:55:48 -07:00
c6774ec1e0
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2010-03-22 16:55:46 -07:00
5b14d2ab2f
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
2010-03-22 16:50:58 -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
e96be1888a
Allow zfs_config.h to be included by dependant packages (updated)
...
We need dependent packages to be able to include zfs_config.h to
build properly. This was partially solved previously be using
AH_BOTTOM to #undef common #defines (PACKAGE, VERSION, etc) which
autoconf always adds and cannot be easily removed. This solution
works as long as the zfs_config.h is included before your projects
config.h. That turns out to be easier said than done. In particular,
this is a problem when your package includes its config.h using the
-include gcc option which ensures the first thing included is your
config.h.
To handle all cases cleanly I have removed the AH_BOTTOM hack and
replaced it with an AC_CONFIG_HEADERS command. This command runs
immediately after zfs_config.h is written and with a little awk-foo
it strips the offending #defines from the file. This eliminates
the problem entirely and makes header safe for inclusion.
2010-03-22 16:42:18 -07:00
db5ffe08dc
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-03-11 16:30:36 -08:00
620020b975
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-03-11 16:30:34 -08:00
dc8c9a7e73
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-03-11 16:30:27 -08:00
74df4d49eb
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-03-11 16:30:25 -08:00
e8d747c9a0
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-03-11 16:30:19 -08:00
cc8000a838
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-03-11 16:30:16 -08:00
1eb5627dad
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-03-11 16:30:10 -08:00
b48f456304
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-03-11 16:30:08 -08:00
36ad1ed5de
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-03-11 16:30:01 -08:00
b9070b43c9
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-11 16:29:59 -08:00
bd006111b7
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-03-11 16:29:53 -08:00
93d324fd4a
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-03-11 16:29:51 -08:00
bbee52aa4a
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-03-11 16:29:45 -08:00
33bf15d468
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-03-11 16:29:43 -08:00
2392175380
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-03-11 16:29:37 -08:00
340009a60c
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-03-11 16:29:35 -08:00
c6b0cce7df
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-03-11 16:29:29 -08:00
883729802c
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-03-11 16:29:27 -08:00
6581d0d9ca
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-03-11 16:29:21 -08:00
c5bfc2688e
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-11 16:29:19 -08:00
d0a3998aca
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-03-11 16:29:13 -08:00
70455c2caa
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-11 16:29:11 -08:00
f193fd041a
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-11 16:29:11 -08:00
e32597303c
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-03-11 16:29:00 -08:00
85746e2fb5
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-03-11 16:28:58 -08:00
f381ad2000
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-03-11 16:28:52 -08:00
a86407d067
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-03-11 16:28:50 -08:00
82d77512ac
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2010-03-11 16:28:44 -08:00
82c1e3808c
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-03-11 16:28:42 -08:00
c2f1d3778c
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-03-11 16:28:36 -08:00
245d70e8f1
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2010-03-11 16:28:34 -08:00
Brian Behlendorf