From: Peter Zijlstra <peterz@infradead.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ingo Molnar <mingo@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Josh Poimboeuf <jpoimboe@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Borislav Petkov <bp@alien8.de>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [GIT PULL] objtool changes for v5.19
Date: Tue, 24 May 2022 20:08:05 +0200 [thread overview]
Message-ID: <Yo0fBWQEevzxttdZ@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <CAHk-=whRTihOdCij9MxpG433cB_9ZHhBeMVAVpAA5Bf2mdr5yA@mail.gmail.com>
On Tue, May 24, 2022 at 10:53:40AM -0700, Linus Torvalds wrote:
> On Mon, May 23, 2022 at 11:02 PM Ingo Molnar <mingo@kernel.org> wrote:
> >
> > Note that with your latest tree you'll get 3 new conflicts:
>
> No problem, but the conflicts did make something clear: the objtool
> code should just get rid of the "--uaccess" flag that is now
> unconditional when CONFIG_X86_SMAP has been removed.
>
> I didn't actually do that, and instead just did the mindless merge
> conflict resolution, but it might be a good idea.
Yes, I think there is patch pending for that, but given the total merge
pain we already had, I was waiting for all the dust to settle before
taking it further.
next prev parent reply other threads:[~2022-05-24 18:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-23 16:32 [GIT PULL] objtool changes for v5.19 Ingo Molnar
2022-05-24 5:34 ` Ingo Molnar
2022-05-24 6:02 ` Ingo Molnar
2022-05-24 17:53 ` Linus Torvalds
2022-05-24 18:08 ` Peter Zijlstra [this message]
2022-05-24 18:14 ` Josh Poimboeuf
2022-05-24 19:53 ` pr-tracker-bot
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=Yo0fBWQEevzxttdZ@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=bp@alien8.de \
--cc=jpoimboe@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/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