Brian Behlendorf
|
9de4108779
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 10:18:12 -08:00 |
|
Brian Behlendorf
|
3e2e5c4535
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-19 10:18:12 -08:00 |
|
Brian Behlendorf
|
88251643d7
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-19 10:18:11 -08:00 |
|
Brian Behlendorf
|
a68af79057
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-19 10:18:11 -08:00 |
|
Brian Behlendorf
|
d4c39af7a6
|
Re-add KM_PUSHPAGE
|
2008-12-19 10:15:52 -08:00 |
|
Brian Behlendorf
|
330840ff2e
|
Re-add KM_PUSHPAGE
|
2008-12-19 10:15:27 -08:00 |
|
Brian Behlendorf
|
1a0d43ceac
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 09:53:37 -08:00 |
|
Brian Behlendorf
|
2d0ae2710c
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 09:52:53 -08:00 |
|
Brian Behlendorf
|
5906903384
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-19 09:52:52 -08:00 |
|
Brian Behlendorf
|
23d1835844
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-19 09:52:51 -08:00 |
|
Brian Behlendorf
|
3d8832a795
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-19 09:52:51 -08:00 |
|
Brian Behlendorf
|
3bc48c3e74
|
Missing func readd
|
2008-12-19 09:50:15 -08:00 |
|
Brian Behlendorf
|
111303eeb8
|
context
|
2008-12-19 09:47:09 -08:00 |
|
Brian Behlendorf
|
dbc567603d
|
Readd removed hunk
|
2008-12-19 09:39:17 -08:00 |
|
Brian Behlendorf
|
68418e26b8
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 14:00:05 -08:00 |
|
Brian Behlendorf
|
fa020b0f7e
|
Remove -Wshadow for now
|
2008-12-18 13:57:27 -08:00 |
|
Brian Behlendorf
|
ef0739a21d
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 13:52:59 -08:00 |
|
Brian Behlendorf
|
433b5c8023
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 13:52:17 -08:00 |
|
Brian Behlendorf
|
532525be3a
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-18 13:52:16 -08:00 |
|
Brian Behlendorf
|
93bc33a39e
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-18 13:52:16 -08:00 |
|
Brian Behlendorf
|
23e30eeec9
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-18 13:52:15 -08:00 |
|
Brian Behlendorf
|
6cccf01d35
|
Missed needed drc var
|
2008-12-18 13:50:12 -08:00 |
|
Brian Behlendorf
|
07901e75cc
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 13:43:58 -08:00 |
|
Brian Behlendorf
|
bab7f42832
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 13:43:20 -08:00 |
|
Brian Behlendorf
|
d6c4c3cce2
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-18 13:43:19 -08:00 |
|
Brian Behlendorf
|
5ce7826ab4
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-18 13:43:19 -08:00 |
|
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
|
fea7eb9fe4
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 13:27:14 -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
|
c04bbb0b61
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-18 13:26:35 -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
|
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 |
|
Brian Behlendorf
|
e6169bf282
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 13:19:03 -08:00 |
|
Brian Behlendorf
|
72bf32a79f
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 13:18:19 -08:00 |
|
Brian Behlendorf
|
844a9ced6d
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-18 13:18:17 -08:00 |
|
Brian Behlendorf
|
efd36af3be
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-18 13:18:15 -08:00 |
|
Brian Behlendorf
|
33e499be43
|
Merge branch 'fix-stack' into refs/top-bases/fix-branch
|
2008-12-18 13:18:15 -08:00 |
|
Brian Behlendorf
|
8e136cf0c9
|
Add noinline macro for userspace
|
2008-12-18 13:15:58 -08:00 |
|
Brian Behlendorf
|
5c0f0ca54f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 11:52:03 -08:00 |
|
Brian Behlendorf
|
4be8cdca38
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 11:51:24 -08:00 |
|
Brian Behlendorf
|
fe6a073e02
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-18 11:51:23 -08:00 |
|
Brian Behlendorf
|
cf4b3895f1
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-18 11:51:23 -08:00 |
|
Brian Behlendorf
|
458a2444c2
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-18 11:51:22 -08:00 |
|
Brian Behlendorf
|
d957a6c66f
|
Resolve dnp shadow conflict
|
2008-12-18 11:49:22 -08:00 |
|
Brian Behlendorf
|
57ab7adc3f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-18 11:44:20 -08:00 |
|
Brian Behlendorf
|
d63e6259f6
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 11:43:44 -08:00 |
|
Brian Behlendorf
|
6dc6345ae3
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2008-12-18 11:43:44 -08:00 |
|
Brian Behlendorf
|
b98891bf17
|
Resolve time conflict
|
2008-12-18 11:41:30 -08:00 |