32e7118879
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-07-14 10:44:28 -07:00
56d160bcd2
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-07-14 10:44:25 -07:00
5b09d8d6fb
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-07-14 10:44:19 -07:00
072742ffc8
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-07-14 10:44:16 -07:00
de72677840
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-07-14 10:44:09 -07:00
579bcbf86e
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-07-14 10:44:07 -07:00
d1a9d684b1
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-07-14 10:44:00 -07:00
adca51af24
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-07-14 10:43:57 -07:00
6525b7b97e
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-07-14 10:43:51 -07:00
1a95cc2137
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-07-14 10:43:48 -07:00
2bb8024b6f
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-07-14 10:43:41 -07:00
166060e0cb
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-07-14 10:43:39 -07:00
733385ea0c
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-07-14 10:43:32 -07:00
0fbdc396f0
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-07-14 10:43:30 -07:00
c9c0f69a74
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-07-14 10:43:23 -07:00
379584a104
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-07-14 10:43:21 -07:00
8306c92e13
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-07-14 10:43:14 -07:00
bd576fc191
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-07-14 10:43:11 -07:00
cbe6106d85
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-07-14 10:43:05 -07:00
3dc14f738b
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-07-14 10:43:02 -07:00
d706e51bd9
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-07-14 10:42:55 -07:00
b4f22737b9
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-07-14 10:42:53 -07:00
6b4b16ebba
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-07-14 10:42:46 -07:00
7cb1dcada5
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-07-14 10:42:44 -07:00
f21de7ab5e
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-07-14 10:42:37 -07:00
b93a441414
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-07-14 10:42:34 -07:00
fdaac6be54
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-07-14 10:42:28 -07:00
6352caae40
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-07-14 10:42:25 -07:00
dccff58e11
Only make compiler warnings fatal with --enable-debug
...
While in theory I like the idea of compiler warnings always being
fatal. In practice this causes problems when small harmless errors
cause build failures for end users. To handle this I've updated
the build system such that -Werror is only used when --enable-debug
is passed to configure. This is how I always build when developing
so I'll catch all build warnings and end users will not get stuck
by minor issues.
2010-07-14 10:41:48 -07:00
427d79d6f6
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-07-12 10:25:43 -07:00
66ed1ba5a6
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-07-12 10:25:40 -07:00
679a87ddc0
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-07-12 10:25:34 -07:00
013d58f5be
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-07-12 10:25:31 -07:00
2e090ea2e0
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-07-12 10:25:25 -07:00
4f9e6024c5
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-07-12 10:25:22 -07:00
94e8dccb0f
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-07-12 10:25:16 -07:00
154ef74ed2
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-07-12 10:25:13 -07:00
138205187e
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-07-12 10:25:07 -07:00
99ffebbafd
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-07-12 10:25:05 -07:00
3f8b24c193
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-07-12 10:24:58 -07:00
5b93e8041c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-07-12 10:24:56 -07:00
89d1064966
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-07-12 10:24:48 -07:00
97bf94e219
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-07-12 10:24:46 -07:00
a0b6b3bcbc
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-07-12 10:24:40 -07:00
dbae106f8c
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-07-12 10:24:37 -07:00
03ec040e81
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-07-12 10:24:31 -07:00
25af873dbc
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-07-12 10:24:28 -07:00
28932c2e69
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-07-12 10:24:22 -07:00
9e48a20559
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-07-12 10:24:19 -07:00
3ffedb70e4
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-07-12 10:24:13 -07:00
Brian Behlendorf