On 4/7/19 4:17 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kspp-gustavo tree got a conflict in:
>
> arch/x86/include/asm/syscall.h
>
> between commits:
>
> b35f549df1d7 ("syscalls: Remove start and number from syscall_get_arguments() args")
> 32d92586629a ("syscalls: Remove start and number from syscall_set_arguments() args")
>
> from Linus' tree and commit:
>
> 1f7ae812f87e ("x86/syscalls: Mark expected switch fall-throughs")
>
I just removed the above commit from my tree.
Thanks for the report, Stephen.
--
Gustavo
