8dc5609e72
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-10-09 16:44:47 -07:00
8b6b31f3e4
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-10-09 16:42:09 -07:00
cb91bbe6ce
Additional set of build system tweaks for libefi library.
2009-10-09 16:37:32 -07:00
f0ac8537ff
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-10-09 16:23:16 -07:00
cae4a99504
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-10-09 16:23:13 -07:00
d7e242199c
Header efi_partition.h moved to lib/libefi/include/sys/
2009-10-09 16:18:39 -07:00
28cdfd90ef
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-10-09 16:13:31 -07:00
fc2213dfac
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
...
Conflicts:
lib/Makefile.am
2009-10-09 16:12:49 -07:00
a740d2a8f7
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/Makefile.am
2009-10-09 16:06:51 -07:00
a0337cfcd8
Add libefi library in to the build system.
2009-10-09 15:58:45 -07:00
b04c6f54b9
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-10-09 15:46:16 -07:00
746882c100
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-10-09 15:45:38 -07:00
90b0761a16
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-10-09 15:43:37 -07:00
e0e0f0ea84
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-10-09 15:43:33 -07:00
9302f90662
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-10-09 15:42:56 -07:00
3728b6d9c1
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-10-09 15:42:16 -07:00
1b0e5a1485
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-10-09 15:42:15 -07:00
5c36312909
Script update-zfs.sh updated to include libefi library
2009-10-09 15:37:29 -07:00
0d8bb46b58
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-10-09 15:03:53 -07:00
6ef15db027
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-10-09 15:03:50 -07:00
f73cff230f
Reverting changes on linux-have-libefi topic branch.
2009-10-09 14:59:05 -07:00
92bb246ab4
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-08-18 14:22:55 -07:00
547471e842
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-08-18 14:22:00 -07:00
87bdf80fb7
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-08-18 14:19:13 -07:00
147adbe815
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-08-18 14:18:40 -07:00
e4b55cfbff
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-18 14:18:36 -07:00
5d83878f46
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-18 14:18:34 -07:00
e134b976b6
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2009-08-18 14:18:33 -07:00
b29c1f87a0
Required build 121 updates for gcc-missing-braces
2009-08-18 14:08:46 -07:00
ae556c9174
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-08-18 13:01:34 -07:00
3e17f18dcc
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-08-18 12:35:43 -07:00
2d067983d6
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-08-18 12:29:48 -07:00
c67303e092
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/dsl_dataset.c
module/zfs/rrwlock.c
module/zfs/spa_history.c
module/zfs/zfs_ioctl.c
2009-08-18 12:26:09 -07:00
50c623ccef
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-18 12:10:55 -07:00
b99b422796
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-18 12:08:58 -07:00
41b297a27f
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2009-08-18 12:08:46 -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
1f8a43f7a2
Refresh autogen products
2009-08-17 21:58:33 -07:00
5ad5798f92
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-08-04 15:59:15 -07:00
1dd0a6bab1
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-08-04 15:58:13 -07:00
e86a0e8ad1
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-08-04 15:55:06 -07:00
72fc3eca7e
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-08-04 15:54:25 -07:00
f88cbd6535
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-04 15:54:21 -07:00
8c28ed9bff
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-08-04 15:54:19 -07:00
7069d048a0
Revert kthreads based on pthread thread specific data due to failure.
...
With this patch applied I get the following failure 100% of the time,
I'd prefer to debug it and keep moving forward but I do not have the
time right now so I'm reverting the patch to the version which worked.
Ricardo please fix.
(gdb) bt
0 ztest_dmu_write_parallel (za=0x2aaaac898960) at
../../cmd/ztest/ztest.c:2566
1 0x0000000000405a79 in ztest_thread (arg=<value optimized out>)
at ../../cmd/ztest/ztest.c:3862
2 0x00002b2e6a7a841d in zk_thread_helper (arg=<value optimized out>)
at ../../lib/libzpool/kernel.c:131
3 0x000000379be06367 in start_thread (arg=<value optimized out>)
at pthread_create.c:297
4 0x000000379b2d30ad in clone () from /lib64/libc.so.6
2009-08-04 15:42:24 -07:00
3d8212e5de
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-08-04 14:44:03 -07:00
5cc3f79553
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-08-04 14:43:02 -07:00
4576ca6889
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-08-04 14:39:53 -07:00
Brian Behlendorf