Brian Behlendorf
|
234f23a73a
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:44:41 -07:00 |
|
Brian Behlendorf
|
3803667424
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-07-09 10:44:36 -07:00 |
|
Brian Behlendorf
|
aaf86aab7c
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:44:27 -07:00 |
|
Brian Behlendorf
|
7620726760
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-07-09 10:44:23 -07:00 |
|
Brian Behlendorf
|
a04759f5fc
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:44:14 -07:00 |
|
Brian Behlendorf
|
2ed7001286
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-07-09 10:44:11 -07:00 |
|
Brian Behlendorf
|
3069abcd5d
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:44:01 -07:00 |
|
Brian Behlendorf
|
31b1f1f000
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-07-09 10:43:55 -07:00 |
|
Brian Behlendorf
|
89af8a4e0f
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:43:46 -07:00 |
|
Brian Behlendorf
|
69d8cabd76
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-07-09 10:43:43 -07:00 |
|
Brian Behlendorf
|
7a3d257580
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:43:32 -07:00 |
|
Brian Behlendorf
|
38d7e6d061
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-07-09 10:43:29 -07:00 |
|
Brian Behlendorf
|
dfccd23c2b
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:43:20 -07:00 |
|
Brian Behlendorf
|
573a8989fc
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-07-09 10:43:14 -07:00 |
|
Brian Behlendorf
|
d3b14a1aad
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:43:04 -07:00 |
|
Brian Behlendorf
|
0ad1fb9f91
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-07-09 10:43:01 -07:00 |
|
Brian Behlendorf
|
09b1da3da7
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:42:52 -07:00 |
|
Brian Behlendorf
|
ebc147f796
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-07-09 10:42:49 -07:00 |
|
Brian Behlendorf
|
9fbe57c428
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:42:39 -07:00 |
|
Brian Behlendorf
|
5e10258e65
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-07-09 10:42:35 -07:00 |
|
Brian Behlendorf
|
2d4fa0b507
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:42:25 -07:00 |
|
Brian Behlendorf
|
e91a439720
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-07-09 10:42:21 -07:00 |
|
Brian Behlendorf
|
79fdd61993
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:42:12 -07:00 |
|
Brian Behlendorf
|
7120b27f27
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-07-09 10:42:09 -07:00 |
|
Brian Behlendorf
|
78d2d1b02f
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:41:57 -07:00 |
|
Brian Behlendorf
|
2018d0e610
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-07-09 10:41:54 -07:00 |
|
Brian Behlendorf
|
7a724b1db0
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-07-09 10:41:53 -07:00 |
|
Brian Behlendorf
|
71465b3364
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:41:34 -07:00 |
|
Brian Behlendorf
|
19e8f65be3
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-07-09 10:41:31 -07:00 |
|
Brian Behlendorf
|
64e827d295
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-07-09 10:41:30 -07:00 |
|
Brian Behlendorf
|
e9c498c2f4
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:41:09 -07:00 |
|
Brian Behlendorf
|
8dd6ba6098
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-07-09 10:41:06 -07:00 |
|
Brian Behlendorf
|
0ec4161484
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:40:56 -07:00 |
|
Brian Behlendorf
|
7fd559da1a
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-07-09 10:40:53 -07:00 |
|
Brian Behlendorf
|
d23d372abf
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:40:43 -07:00 |
|
Brian Behlendorf
|
151fb04fc1
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-07-09 10:40:40 -07:00 |
|
Brian Behlendorf
|
bdb627f1ac
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:40:30 -07:00 |
|
Brian Behlendorf
|
1dd419b8bb
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-07-09 10:40:26 -07:00 |
|
Brian Behlendorf
|
f194f1a8a8
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:40:16 -07:00 |
|
Brian Behlendorf
|
d8a401bacb
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-07-09 10:40:13 -07:00 |
|
Brian Behlendorf
|
cc20e505b4
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:40:02 -07:00 |
|
Brian Behlendorf
|
68de6fccf0
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-07-09 10:39:59 -07:00 |
|
Brian Behlendorf
|
149eea21db
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-07-09 10:39:49 -07:00 |
|
Brian Behlendorf
|
a8d32ac1e2
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-07-09 10:39:46 -07:00 |
|
Brian Behlendorf
|
e5e94c40f7
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-07-09 10:39:44 -07:00 |
|
Brian Behlendorf
|
aa8ed32ee8
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-07-09 10:39:43 -07:00 |
|
Brian Behlendorf
|
b2eb5a454b
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-07-09 10:39:42 -07:00 |
|
Brian Behlendorf
|
9e394e10a9
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-07-09 10:39:41 -07:00 |
|
Brian Behlendorf
|
2cc278c96f
|
This change looks to have been made due to Sun bug 6803822, but
it's not exactly clear to me why. Regardless I'm taking it.
|
2009-07-09 10:30:06 -07:00 |
|
Brian Behlendorf
|
43af29de5f
|
Type int accidentally not declared at the top of the function.
|
2009-07-09 10:19:02 -07:00 |