public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Arnaldo Carvalho de Melo <arnaldo.melo@gmail•com>,
	Namhyung Kim <namhyung@kernel•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: duplicate patches in the perf tree
Date: Mon, 2 Sep 2024 10:51:21 +1000	[thread overview]
Message-ID: <20240902105121.1a5b25f8@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 833 bytes --]

Hi all,

The following commits are also in the perf-current tree as different
commits (but the same patches):

  6236ebe07131 ("perf daemon: Fix the build on more 32-bit architectures")
  2518e13275ab ("perf python: Fix the build on 32-bit arm by including missing "util/sample.h"")
  74fd69a35cae ("perf lock contention: Fix spinlock and rwlock accounting")
  37e2a19c98bf ("perf test pmu: Set uninitialized PMU alias to null")

These are commits

  478e3c7ebbe7 ("perf daemon: Fix the build on more 32-bit architectures")
  4cb80590f12d ("perf python: include "util/sample.h"")
  60f47d2c58cb ("perf lock contention: Fix spinlock and rwlock accounting")
  387ad33e5410 ("perf test pmu: Set uninitialized PMU alias to null")

and this last one is causing an unnecessary conflict.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2024-09-02  0:51 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-02  0:51 Stephen Rothwell [this message]
2024-09-04 22:42 ` linux-next: duplicate patches in the perf tree Stephen Rothwell
2024-09-05 15:07   ` Arnaldo Carvalho de Melo
  -- strict thread matches above, loose matches on Subject: below --
2024-07-08 21:57 Stephen Rothwell
2023-05-08  0:53 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=20240902105121.1a5b25f8@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=arnaldo.melo@gmail$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=namhyung@kernel$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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