From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Gustavo A. R. Silva" <gustavo@embeddedor•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
"Steven Rostedt (VMware)" <rostedt@goodmis•org>
Subject: linux-next: manual merge of the kspp-gustavo tree with Linus' tree
Date: Mon, 8 Apr 2019 07:17:31 +1000 [thread overview]
Message-ID: <20190408071731.6bd422f3@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2019-04-07 21:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-07 21:17 Stephen Rothwell [this message]
2019-04-08 23:53 ` linux-next: manual merge of the kspp-gustavo tree with Linus' tree Gustavo A. R. Silva
2019-04-09 0:51 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190408071731.6bd422f3@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=gustavo@embeddedor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rostedt@goodmis$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox