Brian Behlendorf
|
732fe6a75f
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-18 13:43:19 -08:00 |
|
Brian Behlendorf
|
973a9d5a79
|
Resolve drr shadow by breaking hunk in to a new function, which is just cleaner anyway
|
2008-12-18 13:41:21 -08:00 |
|
Brian Behlendorf
|
eca8a8ff8f
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-18 13:28:20 -08:00 |
|
Brian Behlendorf
|
7d3f61a94d
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:28:19 -08:00 |
|
Brian Behlendorf
|
d36c4b80f9
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-18 13:28:17 -08:00 |
|
Brian Behlendorf
|
c95626a90d
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:28:14 -08:00 |
|
Brian Behlendorf
|
3e24722dc1
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-18 13:28:12 -08:00 |
|
Brian Behlendorf
|
3a0347f52d
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:28:09 -08:00 |
|
Brian Behlendorf
|
9778e475c5
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-18 13:28:07 -08:00 |
|
Brian Behlendorf
|
2330534d4f
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:28:04 -08:00 |
|
Brian Behlendorf
|
7adc17a007
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-18 13:28:02 -08:00 |
|
Brian Behlendorf
|
71723595c2
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:27:59 -08:00 |
|
Brian Behlendorf
|
6c21e29045
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-18 13:27:57 -08:00 |
|
Brian Behlendorf
|
a9ed19bc50
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:27:54 -08:00 |
|
Brian Behlendorf
|
80037044d7
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-18 13:27:52 -08:00 |
|
Brian Behlendorf
|
2ef1c83aaf
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:27:49 -08:00 |
|
Brian Behlendorf
|
4adc0464f2
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-18 13:27:47 -08:00 |
|
Brian Behlendorf
|
ef5b8b1a8d
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:27:44 -08:00 |
|
Brian Behlendorf
|
651f0337c4
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-18 13:27:42 -08:00 |
|
Brian Behlendorf
|
631acf084a
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:27:39 -08:00 |
|
Brian Behlendorf
|
7c56a7d623
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-18 13:27:37 -08:00 |
|
Brian Behlendorf
|
fcdb364844
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:27:34 -08:00 |
|
Brian Behlendorf
|
83b052205b
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-18 13:27:32 -08:00 |
|
Brian Behlendorf
|
6d96971876
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:27:29 -08:00 |
|
Brian Behlendorf
|
3ed3a6d46e
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-18 13:27:27 -08:00 |
|
Brian Behlendorf
|
0f0f1edd30
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:27:24 -08:00 |
|
Brian Behlendorf
|
a3cbac5278
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-18 13:27:23 -08:00 |
|
Brian Behlendorf
|
a0ba5c46c1
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-18 13:27:22 -08:00 |
|
Brian Behlendorf
|
6f28b740f6
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:27:17 -08:00 |
|
Brian Behlendorf
|
6ef7594e64
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-18 13:27:15 -08:00 |
|
Brian Behlendorf
|
fea7eb9fe4
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 13:27:14 -08:00 |
|
Brian Behlendorf
|
189e79d404
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:27:09 -08:00 |
|
Brian Behlendorf
|
6139a7f023
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-18 13:27:07 -08:00 |
|
Brian Behlendorf
|
99c9b66c68
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:27:04 -08:00 |
|
Brian Behlendorf
|
836ed023b8
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-18 13:27:02 -08:00 |
|
Brian Behlendorf
|
3abfcee4f8
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:26:58 -08:00 |
|
Brian Behlendorf
|
1161edc1c5
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-18 13:26:57 -08:00 |
|
Brian Behlendorf
|
417759d1c8
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:26:54 -08:00 |
|
Brian Behlendorf
|
3f873e3468
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-18 13:26:52 -08:00 |
|
Brian Behlendorf
|
923392ffae
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:26:49 -08:00 |
|
Brian Behlendorf
|
b403d58557
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-18 13:26:47 -08:00 |
|
Brian Behlendorf
|
39554026a9
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:26:44 -08:00 |
|
Brian Behlendorf
|
8c1081cd63
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-18 13:26:42 -08:00 |
|
Brian Behlendorf
|
83e1d2bdbc
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:26:39 -08:00 |
|
Brian Behlendorf
|
326018b706
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-18 13:26:36 -08:00 |
|
Brian Behlendorf
|
1a6091791d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 13:26:36 -08:00 |
|
Brian Behlendorf
|
8f52e45adf
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-18 13:26:35 -08:00 |
|
Brian Behlendorf
|
c04bbb0b61
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-18 13:26:35 -08:00 |
|
Brian Behlendorf
|
8eccbd95b9
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-18 13:26:34 -08:00 |
|
Brian Behlendorf
|
163f096cb6
|
Resolve remove shadow, rename to rm
|
2008-12-18 13:24:37 -08:00 |