Brian Behlendorf
|
d57bb8312d
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:22:30 -07:00 |
|
Brian Behlendorf
|
84b63f7730
|
Remove all #pragma idents from libspl.
|
2009-03-11 12:13:44 -07:00 |
|
Brian Behlendorf
|
a67d75ecc8
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-03-11 11:22:38 -07:00 |
|
Brian Behlendorf
|
e77e7b4dc3
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-03-11 11:22:35 -07:00 |
|
Brian Behlendorf
|
4fa15dcb16
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-03-11 11:22:24 -07:00 |
|
Brian Behlendorf
|
af12291488
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
Conflicts:
module/zfs/rrwlock.c
module/zfs/zfs_replay.c
|
2009-03-11 11:22:11 -07:00 |
|
Brian Behlendorf
|
8335169542
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-03-11 11:20:47 -07:00 |
|
Brian Behlendorf
|
68b242507a
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-03-11 11:20:44 -07:00 |
|
Brian Behlendorf
|
41af9504b9
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-03-11 11:20:33 -07:00 |
|
Brian Behlendorf
|
3a23753b70
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-03-11 11:20:30 -07:00 |
|
Brian Behlendorf
|
b6f707bc28
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-03-11 11:20:17 -07:00 |
|
Brian Behlendorf
|
a55824aa6a
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-03-11 11:20:15 -07:00 |
|
Brian Behlendorf
|
8b147b2133
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-11 11:20:01 -07:00 |
|
Brian Behlendorf
|
261ca2beb9
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-03-11 11:19:58 -07:00 |
|
Brian Behlendorf
|
294c360588
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-03-11 11:19:47 -07:00 |
|
Brian Behlendorf
|
70f7318e8d
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-03-11 11:19:42 -07:00 |
|
Brian Behlendorf
|
0a44903559
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-03-11 11:19:30 -07:00 |
|
Brian Behlendorf
|
f6c5e39707
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-03-11 11:19:26 -07:00 |
|
Brian Behlendorf
|
92ecc382bb
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-03-11 11:19:14 -07:00 |
|
Brian Behlendorf
|
1c8bbc5fd9
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-03-11 11:19:10 -07:00 |
|
Brian Behlendorf
|
554070ec2f
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-11 11:18:57 -07:00 |
|
Brian Behlendorf
|
fbe3b02667
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-03-11 11:18:54 -07:00 |
|
Brian Behlendorf
|
05720c17ca
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-03-11 11:18:40 -07:00 |
|
Brian Behlendorf
|
0eca278f8a
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-03-11 11:18:37 -07:00 |
|
Brian Behlendorf
|
b08021512c
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-03-11 11:18:26 -07:00 |
|
Brian Behlendorf
|
3cc7a2814d
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-03-11 11:18:23 -07:00 |
|
Brian Behlendorf
|
1dd2cb6e66
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-03-11 11:18:08 -07:00 |
|
Brian Behlendorf
|
f39cd76b0b
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-11 11:18:05 -07:00 |
|
Brian Behlendorf
|
96cc021270
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-11 11:18:01 -07:00 |
|
Brian Behlendorf
|
b82b0ca026
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-03-11 11:17:41 -07:00 |
|
Brian Behlendorf
|
d402ab0f39
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-03-11 11:17:38 -07:00 |
|
Brian Behlendorf
|
7a08ef9d52
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
Conflicts:
module/zfs/spa_boot.c
|
2009-03-11 11:17:23 -07:00 |
|
Brian Behlendorf
|
f1f8c299eb
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-03-11 11:16:40 -07:00 |
|
Brian Behlendorf
|
9d1e987b15
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-03-11 11:16:32 -07:00 |
|
Brian Behlendorf
|
3534359412
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-03-11 11:16:19 -07:00 |
|
Brian Behlendorf
|
013ff8660b
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-03-11 11:16:14 -07:00 |
|
Brian Behlendorf
|
ab6d9668ad
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-03-11 11:16:03 -07:00 |
|
Brian Behlendorf
|
47e0037a8b
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-03-11 11:15:59 -07:00 |
|
Brian Behlendorf
|
73bae79896
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-03-11 11:15:46 -07:00 |
|
Brian Behlendorf
|
bc22a004ee
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-03-11 11:15:40 -07:00 |
|
Brian Behlendorf
|
5939e07897
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-03-11 11:15:29 -07:00 |
|
Brian Behlendorf
|
0d40fb36a1
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-03-11 11:15:26 -07:00 |
|
Brian Behlendorf
|
f462297391
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-03-11 11:15:15 -07:00 |
|
Brian Behlendorf
|
079eedfaf9
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-03-11 11:15:12 -07:00 |
|
Brian Behlendorf
|
bf200630f9
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:
module/zfs/rrwlock.c
module/zfs/spa_boot.c
module/zfs/zfs_replay.c
|
2009-03-11 11:12:24 -07:00 |
|
Brian Behlendorf
|
c143e6e5b9
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-03-11 11:09:18 -07:00 |
|
Brian Behlendorf
|
dff484a388
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-03-11 11:09:13 -07:00 |
|
Brian Behlendorf
|
5f30a3cb0e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-03-11 11:09:11 -07:00 |
|
Brian Behlendorf
|
57b10339b3
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-03-11 11:00:45 -07:00 |
|
Brian Behlendorf
|
8fe801fd8f
|
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
|
2009-03-11 11:00:42 -07:00 |