Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230628215954.1230048-1-namhyung@kernel.org>
In-Reply-To: <20230628215954.1230048-1-namhyung@kernel.org>
From:   Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri, 30 Jun 2023 11:43:04 -0700
Message-ID: <CAHk-=whOLQsPiDJifHzfg+q-W4q=MXcbvzKLS4J4otOicbZqjA@mail.gmail.com>
Subject: Re: [GIT PULL] perf tools changes for v6.5
To:     Namhyung Kim <namhyung@kernel.org>
Cc:     Arnaldo Carvalho de Melo <acme@kernel.org>,
        Jiri Olsa <jolsa@kernel.org>, Ian Rogers <irogers@google.com>,
        Adrian Hunter <adrian.hunter@intel.com>,
        Ingo Molnar <mingo@kernel.org>,
        Thomas Gleixner <tglx@linutronix.de>,
        LKML <linux-kernel@vger.kernel.org>,
        linux-perf-users@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Wed, 28 Jun 2023 at 15:00, Namhyung Kim <namhyung@kernel.org> wrote:
>
> Please consider pulling perf tool changes.  I'm doing this on behalf of
> Arnaldo as he's on vacation.  This is my first pull request and hope I
> didn't break anything. :)

Things look normal, although I find your pgp key situation confusing.

I looked up your gpg key from the kernel.org pgp key repo, but that's
apparently not the one you used for signing this.

So I have two keys for you, and neither of them are then signed by
others (although that part is probably just the usual pgp mess with
signatures being dropped due to flooded bogus signatures, which has
made the whole pgp infrastructure be essentially close to useless).

Anyway, I wish the pgp key situation would be better, but it's not an
actual problem.

HOWEVER.

What _is_ a problem is that the end result doesn't build cleanly.

The

        if (list_empty(&pmus))
                perf_pmu__scan(NULL);

        ibs_pmu = perf_pmu__find("ibs_op");

in the amd-ibs-via-core no longer works, and it seems that it should just be

        ibs_pmu = perf_pmus__find("ibs_op");

That's fine - I can do (and did) that merge resolution - and it's part
of my normal "merge and test build", but I'm slightly unhappy that I
wasn't told about this part.

The actual data conflicts were trivial. But this was a semantic
conflict that was invisible to git, but showed up in build testing.

And I *think* you should have known about it, because the conflict you
do talk about shows that

 +perf-y += amd-ibs-via-core-pmu.o

as part of the actual data conflicts.

Anyway, I've resolved this, and it wasn't a *problem*, and I'm just a
bit unhappy that it took me by surprise.

              Linus