On Tue, 11 Apr 2023 16:56:45 +0100 Mark Rutland <mark.rutland@xxxxxxx> wrote: > IIUC Steve was hoping to take the FUNCTION_GRAPH_RETVAL series through the > trace tree, and if that's still the plan, maybe both should go that way? The conflict is minor, and I think I prefer to still have the ARM64 bits go through the arm64 tree, as it will get better testing, and I don't like to merge branches ;-) I've added Linus to the Cc so he knows that there will be conflicts, but as long as we mention it in our pull request, with a branch that includes the solution, it should be fine going through two different trees. -- Steve
