From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
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: Re: linux-next: manual merge of the kspp-gustavo tree with Linus' tree
Date: Mon, 8 Apr 2019 18:53:16 -0500 [thread overview]
Message-ID: <558944e8-5912-dc7c-637c-61dc892bae75@embeddedor.com> (raw)
In-Reply-To: <20190408071731.6bd422f3@canb.auug.org.au>
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
next prev parent reply other threads:[~2019-04-08 23:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-07 21:17 linux-next: manual merge of the kspp-gustavo tree with Linus' tree Stephen Rothwell
2019-04-08 23:53 ` Gustavo A. R. Silva [this message]
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=558944e8-5912-dc7c-637c-61dc892bae75@embeddedor.com \
--to=gustavo@embeddedor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).