Brian Behlendorf
|
f5bb6475ab
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:47:01 -07:00 |
|
Brian Behlendorf
|
1cca71adc5
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-03-11 12:46:59 -07:00 |
|
Brian Behlendorf
|
a392b9789f
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:46:49 -07:00 |
|
Brian Behlendorf
|
86c7e4504a
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-03-11 12:46:47 -07:00 |
|
Brian Behlendorf
|
746ddc7e8a
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:46:36 -07:00 |
|
Brian Behlendorf
|
ff34681923
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-03-11 12:46:32 -07:00 |
|
Brian Behlendorf
|
73723f73b9
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:46:21 -07:00 |
|
Brian Behlendorf
|
a6faa4a39d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-03-11 12:46:19 -07:00 |
|
Brian Behlendorf
|
db4abb0eb7
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:46:09 -07:00 |
|
Brian Behlendorf
|
8cd67dabe3
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-03-11 12:46:07 -07:00 |
|
Brian Behlendorf
|
be6c0fe42a
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:45:56 -07:00 |
|
Brian Behlendorf
|
292abc5144
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-03-11 12:45:53 -07:00 |
|
Brian Behlendorf
|
f1d9cffb31
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:45:43 -07:00 |
|
Brian Behlendorf
|
67bb58519f
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-11 12:45:41 -07:00 |
|
Brian Behlendorf
|
aa3c9e30f4
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-11 12:45:39 -07:00 |
|
Brian Behlendorf
|
d00dcb921a
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:45:21 -07:00 |
|
Brian Behlendorf
|
3cfb9e0c7d
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-03-11 12:45:16 -07:00 |
|
Brian Behlendorf
|
9ceea9faf2
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-11 12:45:15 -07:00 |
|
Brian Behlendorf
|
6dac7faacb
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:44:54 -07:00 |
|
Brian Behlendorf
|
9317ab431c
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-03-11 12:44:52 -07:00 |
|
Brian Behlendorf
|
434cdee383
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:44:42 -07:00 |
|
Brian Behlendorf
|
e4a0e9fd62
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-03-11 12:44:39 -07:00 |
|
Brian Behlendorf
|
1cb6e05e95
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:44:27 -07:00 |
|
Brian Behlendorf
|
fd986ed064
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-03-11 12:44:25 -07:00 |
|
Brian Behlendorf
|
23766f9010
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:44:15 -07:00 |
|
Brian Behlendorf
|
e77ddb2f09
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-03-11 12:44:13 -07:00 |
|
Brian Behlendorf
|
c4e0b57d87
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:43:59 -07:00 |
|
Brian Behlendorf
|
5ae2b4b73e
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-03-11 12:43:57 -07:00 |
|
Brian Behlendorf
|
e2850f4d75
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:43:47 -07:00 |
|
Brian Behlendorf
|
7cd472adc2
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-03-11 12:43:45 -07:00 |
|
Brian Behlendorf
|
8da11058e7
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:43:34 -07:00 |
|
Brian Behlendorf
|
adf52e68be
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-03-11 12:43:32 -07:00 |
|
Brian Behlendorf
|
0cad1eaf40
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-03-11 12:43:30 -07:00 |
|
Brian Behlendorf
|
86baaa124e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-03-11 12:43:29 -07:00 |
|
Brian Behlendorf
|
c1d30c2fd3
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-03-11 12:43:28 -07:00 |
|
Brian Behlendorf
|
ced9992186
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2009-03-11 12:43:28 -07:00 |
|
Brian Behlendorf
|
fbb2843086
|
Ensure idx is properly initialized in all instances.
|
2009-03-11 12:34:24 -07:00 |
|
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 |