Brian Behlendorf
|
36198eda31
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-18 10:07:11 -08:00 |
Brian Behlendorf
|
b2c4e56a4f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-18 10:07:06 -08:00 |
Brian Behlendorf
|
2ea3f11b9e
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-18 10:07:01 -08:00 |
Brian Behlendorf
|
d4787b52b6
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-18 10:06:56 -08:00 |
Brian Behlendorf
|
63249028a8
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-18 10:06:52 -08:00 |
Brian Behlendorf
|
88ad31655c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-18 10:06:47 -08:00 |
Brian Behlendorf
|
57d4abfe7a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-18 10:06:46 -08:00 |
Brian Behlendorf
|
819921a351
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-18 10:06:39 -08:00 |
Brian Behlendorf
|
cf126a8e16
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 10:06:38 -08:00 |
Brian Behlendorf
|
197a716837
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-18 10:06:12 -08:00 |
Brian Behlendorf
|
075674f079
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-18 10:06:04 -08:00 |
Brian Behlendorf
|
5c7ee1347b
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 10:06:01 -08:00 |
Brian Behlendorf
|
012ce813df
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2008-12-18 10:06:00 -08:00 |
Brian Behlendorf
|
e4d1734eb1
|
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
|
2008-12-18 10:05:59 -08:00 |
Brian Behlendorf
|
432399da0f
|
Add dropping written variable declaration
|
2008-12-18 10:03:57 -08:00 |
Brian Behlendorf
|
9cafa3bbd0
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-18 09:06:30 -08:00 |
Brian Behlendorf
|
e7d8dc3064
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-18 09:06:25 -08:00 |
Brian Behlendorf
|
a8a380dfa5
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-18 09:06:20 -08:00 |
Brian Behlendorf
|
4ecf6686d0
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-18 09:06:15 -08:00 |
Brian Behlendorf
|
391f9000dc
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-18 09:06:10 -08:00 |
Brian Behlendorf
|
bce797040c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-18 09:06:06 -08:00 |
Brian Behlendorf
|
8a75774b10
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-18 09:06:05 -08:00 |
Brian Behlendorf
|
00cab20dfb
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-18 09:05:58 -08:00 |
Brian Behlendorf
|
1e70a9b85c
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 09:05:57 -08:00 |
Brian Behlendorf
|
12de95cf38
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-18 09:05:30 -08:00 |
Brian Behlendorf
|
31f641ff43
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-18 09:05:21 -08:00 |
Brian Behlendorf
|
6b7c775e09
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 09:05:11 -08:00 |
Brian Behlendorf
|
06c9438f79
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-18 09:05:10 -08:00 |
Brian Behlendorf
|
cfc42cf0ab
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-18 09:05:09 -08:00 |
Brian Behlendorf
|
0392342e3d
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-18 09:05:08 -08:00 |
Brian Behlendorf
|
c37308fc20
|
Resolve stat conflict with stat()
|
2008-12-18 09:03:02 -08:00 |
Brian Behlendorf
|
d1684019b4
|
Move int out of for construct for c90 compliance
|
2008-12-18 09:01:48 -08:00 |
Brian Behlendorf
|
d15e32bbd2
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-17 17:03:42 -08:00 |
Brian Behlendorf
|
585fd3e1e9
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-17 17:03:33 -08:00 |
Brian Behlendorf
|
a2cbba5d19
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 17:03:24 -08:00 |
Brian Behlendorf
|
b92fd0664c
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 17:03:13 -08:00 |
Brian Behlendorf
|
093c1bbe0e
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 17:03:03 -08:00 |
Brian Behlendorf
|
62d4525a1c
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 17:02:53 -08:00 |
Brian Behlendorf
|
b311e10c5c
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-17 17:02:51 -08:00 |
Brian Behlendorf
|
4b94ff958a
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-17 17:02:36 -08:00 |
Brian Behlendorf
|
511af80b44
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 17:02:34 -08:00 |
Brian Behlendorf
|
2044c4bfd1
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-17 17:01:36 -08:00 |
Brian Behlendorf
|
93e36c1f27
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 17:01:22 -08:00 |
Brian Behlendorf
|
53e66eef5a
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 17:01:14 -08:00 |
Brian Behlendorf
|
6e26929ddf
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 17:01:12 -08:00 |
Brian Behlendorf
|
420137d529
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 17:01:09 -08:00 |
Brian Behlendorf
|
194244b80b
|
Resolve read shadow conflict
|
2008-12-17 16:57:21 -08:00 |
Brian Behlendorf
|
52d8216e19
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-17 12:48:15 -08:00 |
Brian Behlendorf
|
1a50fc5480
|
Resolve collision
|
2008-12-17 12:40:17 -08:00 |
Brian Behlendorf
|
8cfc6c6ef3
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-17 12:29:38 -08:00 |
Brian Behlendorf
|
f22f1528f5
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-17 12:29:22 -08:00 |
Brian Behlendorf
|
e885dd3a7d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-17 12:29:14 -08:00 |
Brian Behlendorf
|
75bd3d3fae
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 12:29:06 -08:00 |
Brian Behlendorf
|
387d87ba54
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 12:28:56 -08:00 |
Brian Behlendorf
|
f430f3f774
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 12:28:47 -08:00 |
Brian Behlendorf
|
7881d6e148
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 12:28:37 -08:00 |
Brian Behlendorf
|
632a5dc58b
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-17 12:28:36 -08:00 |
Brian Behlendorf
|
5c220cf49c
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-17 12:28:22 -08:00 |
Brian Behlendorf
|
42752f2339
|
Resolve conflict
|
2008-12-17 12:28:15 -08:00 |
Brian Behlendorf
|
0a21fc4a03
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-17 12:26:11 -08:00 |
Brian Behlendorf
|
9129b436bb
|
Resolve conflict
|
2008-12-17 12:24:50 -08:00 |
Brian Behlendorf
|
5fa2d90840
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 12:23:59 -08:00 |
Brian Behlendorf
|
9ef6211ce7
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 12:23:57 -08:00 |
Brian Behlendorf
|
e2a977c404
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-17 12:23:55 -08:00 |
Brian Behlendorf
|
b23299c7db
|
Fix two prototypes in the right place
|
2008-12-17 12:20:20 -08:00 |
Brian Behlendorf
|
27ce147510
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-17 12:16:59 -08:00 |
Brian Behlendorf
|
66cd7d8640
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-17 12:16:37 -08:00 |
Brian Behlendorf
|
3278f7b38d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-17 12:16:26 -08:00 |
Brian Behlendorf
|
e21155cbdf
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 12:16:18 -08:00 |
Brian Behlendorf
|
e3313b241b
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 12:16:08 -08:00 |
Brian Behlendorf
|
6cfaba6688
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 12:15:59 -08:00 |
Brian Behlendorf
|
c0e4b0cc84
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 12:15:49 -08:00 |
Brian Behlendorf
|
fe7d776569
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-17 12:15:47 -08:00 |
Brian Behlendorf
|
956a8280a3
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-17 12:15:28 -08:00 |
Brian Behlendorf
|
895bbc24db
|
Refresh context
|
2008-12-17 12:15:21 -08:00 |
Brian Behlendorf
|
017a76f754
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-17 11:52:31 -08:00 |
Brian Behlendorf
|
126e1d5d92
|
Resolve conflict
|
2008-12-17 11:51:43 -08:00 |
Brian Behlendorf
|
385d51ad69
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 11:50:42 -08:00 |
Brian Behlendorf
|
6a509b3bca
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 11:50:41 -08:00 |
Brian Behlendorf
|
3719c4146d
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-17 11:50:40 -08:00 |
Brian Behlendorf
|
77811f8236
|
Fix prototype
|
2008-12-17 11:48:40 -08:00 |
Brian Behlendorf
|
4ee4891d66
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:10:16 -08:00 |
Brian Behlendorf
|
862436f8c9
|
Strip out userspace interface to mount the FS. I need to talk about the right way to manage these changes with the lustre group at Sun, and see where they stand
|
2008-12-16 16:06:24 -08:00 |
Brian Behlendorf
|
305c3fc652
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 16:53:09 -08:00 |
Brian Behlendorf
|
313c01433d
|
Remove add zfs_i18n dependency
|
2008-12-12 16:41:22 -08:00 |
Brian Behlendorf
|
b62b4773d1
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:28:31 -08:00 |
Brian Behlendorf
|
a2d1d32c17
|
move vdev_disk to it's new home
|
2008-12-11 15:26:36 -08:00 |
Brian Behlendorf
|
2c028659ab
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-11 15:00:19 -08:00 |
Brian Behlendorf
|
589e125bab
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-11 15:00:10 -08:00 |
Brian Behlendorf
|
477a85d905
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-11 15:00:01 -08:00 |
Brian Behlendorf
|
6d37a4ad97
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-11 14:59:57 -08:00 |
Brian Behlendorf
|
d68cecbb9d
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-11 14:59:52 -08:00 |
Brian Behlendorf
|
c35e513cc4
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-11 14:59:48 -08:00 |
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
|
2bf77383ee
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-11 14:59:15 -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
|
de2d4da1a4
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-11 11:37:26 -08:00 |
Brian Behlendorf
|
1f3ed674fc
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-11 11:37:08 -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
|
ad4364426b
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-11 11:35:10 -08:00 |
Brian Behlendorf
|
aca9d98817
|
Fix conflict
|
2008-12-11 11:34:16 -08:00 |
Brian Behlendorf
|
e1694cfaec
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2008-12-11 11:27:18 -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
|
d50467b370
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2008-12-11 11:26:54 -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
|
fc3c415441
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2008-12-11 11:26:02 -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 |