Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
MIME-Version: 1.0
References: <20231129085314.50306434@canb.auug.org.au>
In-Reply-To: <20231129085314.50306434@canb.auug.org.au>
From:   Namhyung Kim <namhyung@kernel.org>
Date:   Wed, 29 Nov 2023 16:11:47 -0800
Message-ID: <CAM9d7cjjZBN1FzJaS5TWaC0=_gE5aQ6j=eVjiHd9GZaaf_0mdw@mail.gmail.com>
Subject: Re: linux-next: manual merge of the perf tree with Linus' tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>,
        Arnaldo Carvalho de Melo <acme@redhat.com>,
        Athira Jajeev <atrajeev@linux.vnet.ibm.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Oliver Upton <oliver.upton@linux.dev>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8BIT
Precedence: bulk

Hello,

On Tue, Nov 28, 2023 at 1:53 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the perf tree got a conflict in:
>
>   tools/perf/Makefile.perf
>
> between commit:
>
>   e2bdd172e665 ("perf build: Generate arm64's sysreg-defs.h and add to include path")
>
> from Lius' tree and commit:
>
>   1638b11ef815 ("perf tools: Add perf binary dependent rule for shellcheck log in Makefile.perf")
>
> from the perf 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.

Thanks for letting us know.  I think Arnaldo can resolve the
conflict when he merges perf-tools into perf-tools-next later
(but before sending the changes for v6.8) as you did.

Thanks,
Namhyung

>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc tools/perf/Makefile.perf
> index 058c9aecf608,824cbc0af7d7..000000000000
> --- a/tools/perf/Makefile.perf
> +++ b/tools/perf/Makefile.perf
> @@@ -1150,7 -1151,8 +1168,8 @@@ endif # CONFIG_PERF_BPF_SKE
>   bpf-skel-clean:
>         $(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TMP_OUT) $(SKELETONS)
>
>  -clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-clean $(LIBPERF)-clean fixdep-clean python-clean bpf-skel-clean tests-coresight-targets-clean
>  +clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-clean $(LIBPERF)-clean arm64-sysreg-defs-clean fixdep-clean python-clean bpf-skel-clean tests-coresight-targets-clean
> +       $(Q)$(MAKE) -f $(srctree)/tools/perf/tests/Makefile.tests clean
>         $(call QUIET_CLEAN, core-objs)  $(RM) $(LIBPERF_A) $(OUTPUT)perf-archive $(OUTPUT)perf-iostat $(LANG_BINDINGS)
>         $(Q)find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
>         $(Q)$(RM) $(OUTPUT).config-detected