Brian Behlendorf
|
98660aec20
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2010-04-29 12:32:01 -07:00 |
|
Brian Behlendorf
|
82782d7874
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2010-04-29 12:32:00 -07:00 |
|
Brian Behlendorf
|
aa4a91aef5
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2010-04-29 12:32:00 -07:00 |
|
Brian Behlendorf
|
354bebb795
|
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
|
2010-04-29 12:31:59 -07:00 |
|
Brian Behlendorf
|
c14cca5c07
|
Add fm_init/fm_fini stubs for user space FMA update.
|
2010-04-29 12:25:18 -07:00 |
|
Brian Behlendorf
|
89154c98f9
|
Update build system to include nvpair_alloc_fixed.c.
|
2010-04-29 12:24:25 -07:00 |
|
Brian Behlendorf
|
f26fce7b17
|
Strip ident pragma from module/nvpair/nvpair_alloc_fixed.c
|
2010-04-29 12:23:12 -07:00 |
|
Brian Behlendorf
|
f1a28f535c
|
Export required nv_alloc_fixed symbols.
|
2010-04-29 12:21:24 -07:00 |
|
Brian Behlendorf
|
c030e94ea9
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:06:37 -07:00 |
|
Brian Behlendorf
|
40d58da788
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2010-04-29 12:06:35 -07:00 |
|
Brian Behlendorf
|
4786b80fd9
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:06:30 -07:00 |
|
Brian Behlendorf
|
b922689e38
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2010-04-29 12:06:28 -07:00 |
|
Brian Behlendorf
|
fa4f1ae294
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:06:22 -07:00 |
|
Brian Behlendorf
|
68cead1354
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2010-04-29 12:06:20 -07:00 |
|
Brian Behlendorf
|
bf2413d198
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:06:14 -07:00 |
|
Brian Behlendorf
|
ce6db1adbe
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2010-04-29 12:06:12 -07:00 |
|
Brian Behlendorf
|
9b8e498632
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:06:06 -07:00 |
|
Brian Behlendorf
|
9dc83e5f34
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2010-04-29 12:06:04 -07:00 |
|
Brian Behlendorf
|
abe9fd8b05
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:05:58 -07:00 |
|
Brian Behlendorf
|
3adc3d2d7d
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2010-04-29 12:05:56 -07:00 |
|
Brian Behlendorf
|
113a72f560
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:05:50 -07:00 |
|
Brian Behlendorf
|
4fdfc60d1d
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2010-04-29 12:05:48 -07:00 |
|
Brian Behlendorf
|
2eb8af298e
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:05:42 -07:00 |
|
Brian Behlendorf
|
00675d0f69
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2010-04-29 12:05:40 -07:00 |
|
Brian Behlendorf
|
df16ac5ee6
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:05:34 -07:00 |
|
Brian Behlendorf
|
f4295781e2
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2010-04-29 12:05:32 -07:00 |
|
Brian Behlendorf
|
6be2fc246f
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:05:25 -07:00 |
|
Brian Behlendorf
|
be442baea7
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2010-04-29 12:05:23 -07:00 |
|
Brian Behlendorf
|
1559032112
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:05:17 -07:00 |
|
Brian Behlendorf
|
47026cc874
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2010-04-29 12:05:15 -07:00 |
|
Brian Behlendorf
|
886cee417f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2010-04-29 12:05:14 -07:00 |
|
Brian Behlendorf
|
51ca6147a7
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:05:04 -07:00 |
|
Brian Behlendorf
|
89a01d411b
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2010-04-29 12:05:02 -07:00 |
|
Brian Behlendorf
|
6b799ba371
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:04:56 -07:00 |
|
Brian Behlendorf
|
7200336bcf
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2010-04-29 12:04:54 -07:00 |
|
Brian Behlendorf
|
e0f88df47e
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:04:47 -07:00 |
|
Brian Behlendorf
|
9fa021c2c1
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2010-04-29 12:04:45 -07:00 |
|
Brian Behlendorf
|
fa60ee8c86
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2010-04-29 12:04:39 -07:00 |
|
Brian Behlendorf
|
36d083ee60
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2010-04-29 12:04:37 -07:00 |
|
Brian Behlendorf
|
66ba722b0a
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2010-04-29 12:04:36 -07:00 |
|
Brian Behlendorf
|
49dff0437f
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2010-04-29 12:04:35 -07:00 |
|
Brian Behlendorf
|
620a5ae89b
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2010-04-29 12:04:33 -07:00 |
|
Brian Behlendorf
|
f3017eccb7
|
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
|
2010-04-29 12:04:33 -07:00 |
|
Brian Behlendorf
|
b9610ade84
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2010-04-29 12:04:33 -07:00 |
|
Brian Behlendorf
|
7a062682fb
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2010-04-29 12:04:32 -07:00 |
|
Brian Behlendorf
|
9c10b70375
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2010-04-29 12:04:31 -07:00 |
|
Brian Behlendorf
|
9d8e4f07ff
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2010-04-29 12:04:30 -07:00 |
|
Brian Behlendorf
|
dcf9769135
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2010-04-29 12:04:28 -07:00 |
|
Brian Behlendorf
|
d4ee043aaf
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2010-04-29 12:04:27 -07:00 |
|
Brian Behlendorf
|
3b31b7c0e8
|
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
|
2010-04-29 12:04:26 -07:00 |