On Tue, Sep 09, 2025 at 09:24:39AM -0700, Reinette Chatre wrote: > > > On 9/9/25 9:19 AM, Borislav Petkov wrote: > > On Tue, Sep 09, 2025 at 09:03:13AM -0700, Reinette Chatre wrote: > >> When I checked tip/master did not include x86/urgent yet but when it does (and > >> tip/master thus includes x86/cache and x86/urgent), could you please > >> merge your series on top of tip/master to ensure all conflicts can be resolved > >> cleanly and ready to provide conflict resolutions to Boris if needed? > > > > Thanks, just give it a test but no rebasing anymore - I'm going through the > > set. If there are conflicts, we do enough patch tetris in tip to catch them > > and handle them upfront - you guys don't have to worry about it. > > Thank you very much Boris. Conflicts in Babu's series were trivial. Fractionally more complex in my AET series (because some of the code touched by Reinette's patch moved to a whole new function. But still not hard. Whole set (upstream + Reinette + Babu + Me) pushed here: git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git reinette-abmc-aet-wip -Tony
