Jonathan Corbet <corbet@xxxxxxx> writes: > Now that I look...the only thing in linux-next currently that conflicts > is the shadow-stack series; if that continues, it might not be necessary > to do anything special. There's an FPU patch now too. Git seems to handle the conflicts *almost* seamlessly, though. So, FYI, I think I'll go ahead and drop this change into docs-next, which will probably get us a cheery note from Stephen in the near future. (Stephen: the change is simply: mv Documentation/x86 Documentation/arch/x86 the only fix I had to do in my test merge was to add the new shadow-stack document in the new directory). Thanks, jon
