From: Andy Lutomirski <luto@amacapital.net>
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-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the audit tree
Date: Wed, 24 Sep 2014 11:14:56 -0700 [thread overview]
Message-ID: <CALCETrXB-qnMz_9Wx6UZZ8gHXRTXb-w9uC_dJrBOeruZ3XqmHw@mail.gmail.com> (raw)
In-Reply-To: <CALCETrWED3LzZzRwVL+X2dtLGVcQ7fPijbObJa-UvyARySoDeQ@mail.gmail.com>
On Wed, Sep 24, 2014 at 11:12 AM, Andy Lutomirski <luto@amacapital.net> wrote:
> On Tue, Sep 23, 2014 at 10:47 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Hi all,
>>
>> Today's linux-next merge of the tip tree got a conflict in
>> arch/x86/kernel/ptrace.c between commit 91397401bb50 ("ARCH: AUDIT:
>> audit_syscall_entry() should not require the arch") from the audit tree
>> and commit e0ffbaabc46d ("x86: Split syscall_trace_enter into two
>> phases") from the tip tree.
>>
>> I fixed it up (see below - there is more cleanup possible since
>> do_audit_syscall_entry() no longer needs its "arch" argument) and can
>> carry the fix as necessary (no action is required).
>
> [mainly for Eric]
>
> This appears to re-introduce the bug fixed in:
>
> commit 81f49a8fd7088cfcb588d182eeede862c0e3303e
> Author: Andy Lutomirski <luto@amacapital.net>
> Date: Fri Sep 5 15:13:52 2014 -0700
>
> x86, x32, audit: Fix x32's AUDIT_ARCH wrt audit
>
> This bug is not currently observable because enabling x32 disables
> syscall auditing.
>
> Eric, do you want to fix this or should I?
Never mind, -ETOOEARLY. There's no bug. TS_COMPAT != is_compat_task.
--Andy
>
> --Andy
--
Andy Lutomirski
AMA Capital Management, LLC
next prev parent reply other threads:[~2014-09-24 18:15 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-24 5:47 linux-next: manual merge of the tip tree with the audit tree Stephen Rothwell
2014-09-24 18:12 ` Andy Lutomirski
2014-09-24 18:14 ` Andy Lutomirski [this message]
2014-09-26 18:02 ` Andy Lutomirski
2014-09-27 10:11 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2014-09-24 5:38 Stephen Rothwell
2014-09-26 15:01 ` Richard Guy Briggs
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=CALCETrXB-qnMz_9Wx6UZZ8gHXRTXb-w9uC_dJrBOeruZ3XqmHw@mail.gmail.com \
--to=luto@amacapital.net \
--cc=eparis@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.