On Mon, 23 Jan 2023 14:40:29 +0000 Catalin Marinas <catalin.marinas@xxxxxxx> wrote: > Hi Mark, > > On Mon, Jan 23, 2023 at 01:45:55PM +0000, Mark Rutland wrote: > > I'm not sure how we want to merge this, so I've moved the core ftrace > > patch to the start of the series so that it can more easily be placed on > > a stable branch if we want that to go via the ftrace tree and the rest > > to go via arm64. > > Happy to queue the whole series since Steve acked the ftrace changes. > But I'll put on a stable branch in case there are any conflicts with the > ftrace tree. > I actually do have a conflict with this patch (I'll post it soon). I could just cherry pick it from your tree. Linus seems to be OK with that when it's just a single change. -- Steve
