On Fri, Nov 30, 2018 at 03:14:30PM +0000, StDenis, Tom wrote: > On 2018-11-30 10:09 a.m., Peter Zijlstra wrote: > > On Fri, Nov 30, 2018 at 02:52:26PM +0000, StDenis, Tom wrote: > >> Hi Peter, > >> > >> Unfortunately I can't apply this on top of our drm-next the first patch > >> fails. > > > > Against what tree would you like the patches? rebasing should not be > > hard I think. > > > > Actually I just tried applying against the tip of master and got the > same errors... > > [root@carrizo linux]# git apply \[PATCH\ 1_4\]\ x86_mm_cpa\:\ Add\ > __cpa_addr\(\)\ helper\ -\ Peter\ Zijlstra\ \<pet...@infradead.org\>\ -\ > 2018-11-30\ 0844.eml > error: patch failed: arch/x86/mm/pageattr.c:228 > error: arch/x86/mm/pageattr.c: patch does not apply > > > Any ideas?
Hurm.. no. They apply cleanly to Linus' tree here. linux-2.6$ git describe v4.20-rc4-156-g94f371cb7394 linux-2.6$ quilt push 4 Applying patch patches/peterz-cpa-addr.patch patching file arch/x86/mm/pageattr.c Applying patch patches/peterz-cpa-fix-flush_array.patch patching file arch/x86/mm/mm_internal.h patching file arch/x86/mm/pageattr.c patching file arch/x86/mm/tlb.c Applying patch patches/peterz-cpa-fold-cpa_flush.patch patching file arch/x86/mm/pageattr.c Applying patch patches/peterz-cpa-clflush_opt.patch patching file arch/x86/mm/pageattr.c Now at patch patches/peterz-cpa-clflush_opt.patch Weird.
