On Wed, Jul 8, 2020 at 10:23 AM Mickaël Salaün <mic@xxxxxxxxxxx> wrote: > On 08/07/2020 09:47, Arnd Bergmann wrote: > > On Wed, Jul 8, 2020 at 9:31 AM Mickaël Salaün <mic@xxxxxxxxxxx> wrote: > >> On 08/07/2020 09:22, Arnd Bergmann wrote: > >>> On Tue, Jul 7, 2020 at 8:10 PM Mickaël Salaün <mic@xxxxxxxxxxx> wrote: > >>> > >>>> index f4a01305d9a6..a63a411a74d5 100644 > >>>> --- a/include/uapi/asm-generic/unistd.h > >>>> +++ b/include/uapi/asm-generic/unistd.h > >> > >> OK, I'll rebase the next series on linux-next. > > > > Just change the number to the next free one, without actually rebasing. > > It's always a bit messy to have multiple syscalls added, but I think that > > causes the least confusion. > > OK, but this will lead to two merge conflicts: patch 8 (asmlinkage) and > patch 9 (tbl files). Yes, there isn't really much one can do about that. > Do you want me to update the tools/perf/arch/*.tbl too? No, I would leave them unchanged. Arnd