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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 891 bytes --]

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")

from the kspp-gustavo tree.

I fixed it up (I just used the version from Linus' tree) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging.  You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[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")
>   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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 205 bytes --]

Hi Gustavo,

On Mon, 8 Apr 2019 18:53:16 -0500 "Gustavo A. R. Silva" <gustavo@embeddedor.com> wrote:
>
> I just removed the above commit from my tree.

OK, thanks.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]