Re: linux-next: manual merge of the tip tree with the powerpc-objtool tree

Hi all, On Thu, 24 Nov 2022 12:29:31 +1100 Stephen Rothwell wrote: > > 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 (

Re: linux-next: manual merge of the tip tree with the powerpc-objtool tree

Christophe Leroy writes: > 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 an

Re: linux-next: manual merge of the tip tree with the powerpc-objtool tree

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 ("objt

linux-next: manual merge of the tip tree with the powerpc-objtool tree

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 (s