From: Richard Guy Briggs <rgb@redhat•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Eric Paris <eparis@redhat•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Andy Lutomirski <luto@amacapital•net>
Subject: Re: linux-next: manual merge of the tip tree with the audit tree
Date: Fri, 26 Sep 2014 11:01:57 -0400 [thread overview]
Message-ID: <20140926150157.GU1992@madcap2.tricolour.ca> (raw)
In-Reply-To: <20140924153857.191a97a4@canb.auug.org.au>
On 14/09/24, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> arch/x86/kernel/entry_64.S between commit b4f0d3755c5e ("audit: x86:
> drop arch from __audit_syscall_entry() interface") from the audit tree
> and commit 1dcf74f6edfc ("x86_64, entry: Use split-phase
> syscall_trace_enter for 64-bit syscalls") from the tip tree.
>
> I fixed it up (probably incorrectly - I removed the auditsys section
> as that is what the latter did) and can carry the fix as necessary (no
> action is required).
The fix looks fine to me. The auditsys section was no longer needed
since it was taken care of via the phase1 and phase2 calls. It was the
part in ptrace.c that was important (it would not have compiled) and you
updated that fine to remove the arch arg.
Thanks, Stephen.
> Stephen Rothwell sfr@canb•auug.org.au
- RGB
--
Richard Guy Briggs <rbriggs@redhat•com>
Senior Software Engineer, Kernel Security, AMER ENG Base Operating Systems, Red Hat
Remote, Ottawa, Canada
Voice: +1.647.777.2635, Internal: (81) 32635, Alt: +1.613.693.0684x3545
next prev parent reply other threads:[~2014-09-26 15:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-24 5:38 linux-next: manual merge of the tip tree with the audit tree Stephen Rothwell
2014-09-26 15:01 ` Richard Guy Briggs [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-09-24 5:47 Stephen Rothwell
2014-09-24 18:12 ` Andy Lutomirski
2014-09-24 18:14 ` Andy Lutomirski
2014-09-26 18:02 ` Andy Lutomirski
2014-09-27 10:11 ` 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=20140926150157.GU1992@madcap2.tricolour.ca \
--to=rgb@redhat$(echo .)com \
--cc=eparis@redhat$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=luto@amacapital$(echo .)net \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/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