From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Michael Ellerman <mpe@ellerman.id.au>
Cc: PowerPC <linuxppc-dev@lists.ozlabs.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the powerpc-objtool tree
Date: Thu, 24 Nov 2022 06:58:18 +0000 [thread overview]
Message-ID: <de806b36-2b5c-3040-22c2-129bc9b5ddd4@csgroup.eu> (raw)
In-Reply-To: <20221124122931.266df8c7@canb.auug.org.au>
Le 24/11/2022 à 02:29, Stephen Rothwell a écrit :
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> tools/objtool/check.c
>
> between commit:
>
> efb11fdb3e1a ("objtool: Fix SEGFAULT")
>
> from the powerpc-objtool tree and commit:
>
> dbcdbdfdf137 ("objtool: Rework instruction -> symbol mapping")
>
> from the tip tree.
>
> I fixed it up (see below) 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.
>
Maybe it would be better to perform the check of insn inside the new
insn_func() then ?
Christophe
next prev parent reply other threads:[~2022-11-24 6:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-24 1:29 Stephen Rothwell
2022-11-24 6:58 ` Christophe Leroy [this message]
2022-11-24 10:37 ` Michael Ellerman
2022-12-15 23:09 ` 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=de806b36-2b5c-3040-22c2-129bc9b5ddd4@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®