Re: linux-next: manual merge of the kspp-gustavo tree with Linus' tree

2019-04-08 Thread Stephen Rothwell
Hi Gustavo, On Mon, 8 Apr 2019 18:53:16 -0500 "Gustavo A. R. Silva" wrote: > > I just removed the above commit from my tree. OK, thanks. -- Cheers, Stephen Rothwell pgpFH68Tq494p.pgp Description: OpenPGP digital signature

Re: linux-next: manual merge of the kspp-gustavo tree with Linus' tree

2019-04-08 Thread Gustavo A. R. Silva
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") > 32d9258662

linux-next: manual merge of the kspp-gustavo tree with Linus' tree

2019-04-07 Thread Stephen Rothwell
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()