Brian Behlendorf
|
347e860de3
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-11 14:59:47 -08:00 |
|
Brian Behlendorf
|
409a33d29e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-11 14:59:41 -08:00 |
|
Brian Behlendorf
|
515c1981f2
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-11 14:59:39 -08:00 |
|
Brian Behlendorf
|
a3c66a6b89
|
Resolve conflict
|
2008-12-11 14:58:34 -08:00 |
|
Brian Behlendorf
|
593aa3e10d
|
Move all current Makefiles to correct locations, updates still needed
|
2008-12-11 14:55:55 -08:00 |
|
Brian Behlendorf
|
b6bcc8a256
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-11 14:26:53 -08:00 |
|
Brian Behlendorf
|
2bcfa6809c
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-11 14:26:34 -08:00 |
|
Brian Behlendorf
|
4ebd4f1f00
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-11 14:26:29 -08:00 |
|
Brian Behlendorf
|
45ea2016b4
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-11 14:26:24 -08:00 |
|
Brian Behlendorf
|
67e283a94c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-11 14:26:19 -08:00 |
|
Brian Behlendorf
|
2fd4174589
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-11 14:26:18 -08:00 |
|
Brian Behlendorf
|
9dfa18b709
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-11 14:26:11 -08:00 |
|
Brian Behlendorf
|
8f8a7e587a
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-11 14:26:10 -08:00 |
|
Brian Behlendorf
|
3bd537afcc
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:25:35 -08:00 |
|
Brian Behlendorf
|
503068ecec
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-11 14:25:32 -08:00 |
|
Brian Behlendorf
|
4bc4fbeb38
|
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
|
2008-12-11 14:25:29 -08:00 |
|
Brian Behlendorf
|
208f59182a
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2008-12-11 14:25:28 -08:00 |
|
Brian Behlendorf
|
32a5a583a3
|
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
|
2008-12-11 14:25:22 -08:00 |
|
Brian Behlendorf
|
b53201c0ca
|
Merge commit 'refs/top-bases/fix-locks' into fix-locks
|
2008-12-11 14:25:16 -08:00 |
|
Brian Behlendorf
|
1e849d9b3b
|
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
|
2008-12-11 14:25:08 -08:00 |
|
Brian Behlendorf
|
3f688a4bd8
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2008-12-11 14:25:07 -08:00 |
|
Brian Behlendorf
|
b8294b1311
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-11 14:25:05 -08:00 |
|
Brian Behlendorf
|
0595328655
|
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
|
2008-12-11 14:25:03 -08:00 |
|
Brian Behlendorf
|
022db7f816
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2008-12-11 14:25:01 -08:00 |
|
Brian Behlendorf
|
ec2b4ef2ed
|
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
|
2008-12-11 14:24:59 -08:00 |
|
Brian Behlendorf
|
9af6637db5
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2008-12-11 14:24:57 -08:00 |
|
Brian Behlendorf
|
c325ac879c
|
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
|
2008-12-11 14:24:56 -08:00 |
|
Brian Behlendorf
|
3e2988aa8b
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2008-12-11 14:24:50 -08:00 |
|
Brian Behlendorf
|
82c8f9af50
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-11 14:24:49 -08:00 |
|
Brian Behlendorf
|
9b3c631dbd
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-11 14:24:48 -08:00 |
|
Brian Behlendorf
|
a4076c7544
|
Script updates
|
2008-12-11 14:21:14 -08:00 |
|
Brian Behlendorf
|
c4911ece24
|
Move library files to lib
|
2008-12-11 14:16:55 -08:00 |
|
Brian Behlendorf
|
a83549fbf3
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-11 14:05:38 -08:00 |
|
Brian Behlendorf
|
31927647a8
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-11 14:05:18 -08:00 |
|
Brian Behlendorf
|
b9c746ed0b
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-11 14:05:13 -08:00 |
|
Brian Behlendorf
|
fdff27558a
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-11 14:05:08 -08:00 |
|
Brian Behlendorf
|
76678238e3
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-11 14:05:03 -08:00 |
|
Brian Behlendorf
|
dfc7c1463a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-11 14:05:02 -08:00 |
|
Brian Behlendorf
|
13dd117d28
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-11 14:04:55 -08:00 |
|
Brian Behlendorf
|
94e1055395
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-11 14:04:54 -08:00 |
|
Brian Behlendorf
|
44ffa43709
|
Resolve conflict
|
2008-12-11 14:01:47 -08:00 |
|
Brian Behlendorf
|
98ce19f04c
|
Update avl, nvpair, spl to unique build dirs
|
2008-12-11 13:54:57 -08:00 |
|
Brian Behlendorf
|
de2d4da1a4
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-11 11:37:26 -08:00 |
|
Brian Behlendorf
|
11e1ce8c2e
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-11 11:36:50 -08:00 |
|
Brian Behlendorf
|
076f7c6a5f
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-11 11:36:40 -08:00 |
|
Brian Behlendorf
|
7515df142f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-11 11:36:31 -08:00 |
|
Brian Behlendorf
|
028c2e29e9
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-11 11:36:22 -08:00 |
|
Brian Behlendorf
|
ef5070a38b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-11 11:36:17 -08:00 |
|
Brian Behlendorf
|
3c0ff259db
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-11 11:36:05 -08:00 |
|
Brian Behlendorf
|
5bb8f9ec25
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-11 11:36:00 -08:00 |
|
Brian Behlendorf
|
aca9d98817
|
Fix conflict
|
2008-12-11 11:34:16 -08:00 |
|
Brian Behlendorf
|
8aad84f781
|
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
|
2008-12-11 11:27:12 -08:00 |
|
Brian Behlendorf
|
e152d6e601
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2008-12-11 11:27:10 -08:00 |
|
Brian Behlendorf
|
206ceddde8
|
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
|
2008-12-11 11:26:49 -08:00 |
|
Brian Behlendorf
|
f421307e1b
|
Merge commit 'refs/top-bases/fix-locks' into fix-locks
|
2008-12-11 11:26:25 -08:00 |
|
Brian Behlendorf
|
84e65c5c1e
|
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
|
2008-12-11 11:25:50 -08:00 |
|
Brian Behlendorf
|
d00b912ed9
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2008-12-11 11:25:48 -08:00 |
|
Brian Behlendorf
|
756a122d37
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-11 11:25:42 -08:00 |
|
Brian Behlendorf
|
3f25e7cd69
|
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
|
2008-12-11 11:25:34 -08:00 |
|
Brian Behlendorf
|
d6ccbb14c5
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2008-12-11 11:25:28 -08:00 |
|
Brian Behlendorf
|
ff282a978f
|
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
|
2008-12-11 11:25:22 -08:00 |
|
Brian Behlendorf
|
cdd670cb2f
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2008-12-11 11:25:15 -08:00 |
|
Brian Behlendorf
|
8f8ac4288f
|
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
|
2008-12-11 11:25:09 -08:00 |
|
Brian Behlendorf
|
b342e90e44
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2008-12-11 11:24:51 -08:00 |
|
Brian Behlendorf
|
4f5d567cfd
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-11 11:24:45 -08:00 |
|
Brian Behlendorf
|
3420896332
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-11 11:24:42 -08:00 |
|
Brian Behlendorf
|
172bb4bd5e
|
Move the world out of /zfs/ and seperate out module build tree
|
2008-12-11 11:08:09 -08:00 |